DEVELOPMENT: di 28 okt 2014 23:02:49 CET
Merge branch 'development' into test