Tags!!!!!!! Finally!!!!
Merge origin/master

Conflicts:
	application/controllers/application.php
	application/views/footer.php