DEVELOPMENT: do 30 okt 2014 12:33:27 CET
Merge branch 'development' into test
DEVELOPMENT: Fri Oct 31 21:26:37 CET 2014
Merge branch 'development' into test