local changes
Merge branch 'master' of https://github.com/ristes/apple-game.git

Conflicts:
	app/controllers/AuthController.java
	app/controllers/Crafty.java
	app/views/Crafty/iso.html
	public/javascripts/ng/controllers.js
	public/javascripts/ng/directives.js
	public/stylesheets/shopwindow.css
	public/templates/side-menu.html