DEVELOPMENT: wo 29 okt 2014 22:50:22 CET
Merge branch 'development' into test
DEVELOPMENT: wo 29 okt 2014 22:50:45 CET
Merge branch 'development' into test