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