Upgraded to Angular 1.3.3

Conflicts:
	trainer/app/index.html