toggle!
Merge branch 'master' of github.com:Theo13/GGJ2014

Conflicts:
	src/Actions/ActAnimationWeapon.hh
	src/DisplayManager.cpp
	src/Enemy.hh