Create Version 1.0 master V1.0
authorTobias Rueetschi <tobisa.rueetschi@bfh.ch>
Thu, 27 Nov 2014 18:38:04 +0000 (19:38 +0100)
committerTobias Rueetschi <tobias.rueetschi@bfh.ch>
Thu, 27 Nov 2014 18:38:04 +0000 (19:38 +0100)

Trivial merge