Merge branch 'callingtree'

Conflicts:
	.gitignore
	Gruntfile.js
	app/index.html
	app/js/services/user.js