Merge branch 'development' of
authorMichael <Michael@Michael-LT.bfh.ch>
Tue, 27 Oct 2015 14:25:15 +0000 (15:25 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Tue, 27 Oct 2015 14:25:36 +0000 (15:25 +0100)
git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development


Trivial merge