Merge origin/master

Conflicts:
	views/scripts/general/footer.php
Merge origin/master

Conflicts:
	views/scripts/general/footer.php