DEVELOPMENT: di 28 okt 2014 21:00:44 CET
Merge branch 'development' into test