fixed some errors
Merge branch 'master' of https://github.com/Containing/Containing-Core

Conflicts:
	src/Main/Controller.java