Fixed compilation errorrs
Merge branch 'master' of https://github.com/Malosw/EggBalloon

Conflicts:
	Application/demo.c