DEVELOPMENT: wo 29 okt 2014 22:42:51 CET
Merge branch 'development' into test
Merge branch 'development' into test

Conflicts:
	server/test.js