Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/includes/settings.php
	admin/index.php
	assets/css/admin.css
	assets/js/backend.js
	database.sql
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/includes/settings.php
	admin/index.php
	assets/css/admin.css
	assets/js/backend.js
	database.sql