DEVELOPMENT: Wed Oct 29 22:53:20 CET 2014
Merge branch 'development' into test
DEVELOPMENT: Wed Oct 29 22:54:22 CET 2014
Merge branch 'development' into test