it's making me push this
Merge branch 'master' of https://github.com/lorier/emag

Conflicts:
	app/css/app.css
Post Meeting tweaks

some image updates, video button larger, iPad frame, p8 video arrow
animation, etc