DEVELOPMENT: di 28 okt 2014 20:58:15 CET
Merge branch 'development' into test