Remajiggering of the stuff.
Merge branch 'master' of git@github.com:Censkh/Hiest.git

Conflicts:
	src/com/censkh/heist/Heist.java