Merge branch 'master' of https://github.com/Team-Castor/GameJam2014.git

Conflicts:
	GameJam2014/src/julien/mechant/Mechant.java