DEVELOPMENT: di 28 okt 2014 23:15:06 CET
Merge branch 'development' into test