syncing sanan
Merge branch 'master' of github.com:rugbyprof/Aii

Conflicts:
	careTeam/js/app.js