DEVELOPMENT: di 28 okt 2014 20:57:46 CET
Merge branch 'development' into test