Travis Changed Sanan
Fixing broken pages
Merge branch 'SananBranch'

Conflicts:
	careTeam/js/app.js