Trying to add rest service for branches (may still have some alerts)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngUSD-client/app/scripts/controllers/main.js