+
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/templates/site/scripts.blade.php
+