Dev commit from 28.3.14
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/test/scala/worldTests/ConstructorSize.scala