Merge branch 'master' of https://github.com/adaam2/wherelionsroam

Conflicts:
	application/views/templates/page_footer.php
Resolved conflict