Merge branch 'master' of https://github.com/apo-j/app_shop

Conflicts:
	app/helpers/app_engine.rb