Updated a lot
Merge branch 'master' of https://github.com/GoesOnGhost/DataStructAlgorithmsConfProject2014

Conflicts:
	createPlaces.class