Add Team and Controllable
Merge branch 'master' of https://github.com/Warrows/GGJ2014-BuchBuchTeam.git