Merge branch 'master' of https://github.com/goper/abc.loc

Conflicts:
	application/views/index/contacts/view.php
Merge branch 'master' of https://github.com/goper/abc.loc