DEVELOPMENT: wo 29 okt 2014 22:40:57 CET
Merge branch 'development' into test