Bunch of changes

Signed-off-by: deathrat <deathrat43@gmail.com>
Update build.xml

Signed-off-by: deathrat <deathrat43@gmail.com>
Merge branch 'master' of https://github.com/deathrat/Better-Than-Bees

Conflicts:
	build.xml