some uin code
Merge branch 'master' of https://github.com/tomvangreen/thecompany.git

Conflicts:
	core/src/ch/digitalmeat/company/Constants.java