home
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/templates/footer.php
Merge remote-tracking branch 'origin/master'
form bug fix