- Database trash for now, i need to clean and comments
Merge branch 'master' of https://github.com/nightwolf93/Zomie-Ogame

Conflicts:
	atnet/app/miscellaneous/app.yml