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