fix images
fix images
Merge branch 'heroku-master' into on-heroku-master

Conflicts:
	public/partials/store.html
Merge branch 'heroku-master' into on-heroku-master
Merge branch 'heroku-master' into on-heroku-master
base authentication
remains:
- logout
- hide menu items
- check in routeProvider
Merge remote-tracking branch 'origin/master'