DEVELOPMENT: di 28 okt 2014 23:08:17 CET
Merge branch 'development' into test