Add flashs
Update
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/60-screenshare

Conflicts:
	app/index.html
Dynamicly send auth tokens
remove user.load
Merge branch 'feature/60-screenshare'

Conflicts:
	app/modules/course/course_factory.js
	app/modules/room/room_factory.js
	app/modules/schedule/schedule_factory.js
	app/modules/schedule/user_schedule_service.js
	app/modules/subject/subject_factory.js
	app/modules/user/user_factory.js