DEVELOPMENT: wo 29 okt 2014 22:36:46 CET
Merge branch 'development' into test