big update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php
	app/views/includes/sidebar.blade.php
	app/views/index.blade.php
	app/views/pages/credits.blade.php