Merge remote-tracking branch 'origin/master'

Conflicts:
	epoch-trackr/App/User/user.view.html