right click callback function and text added to service / directives
Merge branch 'master' of https://github.com/kbaylor/shop-with-me

Conflicts:
	public/javascripts/services/navigationService.js
	public/templates/navigation.html