Merge branch 'Development'

Conflicts:
	app/com/shopservice/Authentication.java
Merge branch 'master' of heroku.com:mservice

Conflicts:
	app/com/shopservice/Authentication.java
fixed slow category loading on production
Merge branch 'Development'

Conflicts:
	app/com/shopservice/Authentication.java