Merge origin/master

Conflicts:
	application/views/footer.php
Merge origin/master

Conflicts:
	application/views/footer.php
Merge origin/master