updated
update
update

Conflicts:
	app/controller/Main.js
	app/view/GebarenDetail.js
	app/view/Video.js
	resources/css/app.css
	resources/sass/app.scss