- added minaret services
Merge branch 'master' of github.com:jonahglover/minaret

Conflicts:
	assets/javascripts/app/services.js