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