hako
Merge branch 'master' of https://github.com/sadecesabri/Haksle

Conflicts:
	app/deamon/Deamon.java
	app/deamon/DeamonController.java