Office
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/scripts/clips/new.phtml
	application/views/scripts/clips/player.phtml
	public/js/app.js