added ngsource
Merge branch 'master' of https://github.com/snapcat/snapcat

Conflicts:
	app/js/services/services.js