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

Conflicts:
	application/views/index/carcass.php
	media/css/main.css
Merge branch 'master' of https://github.com/goper/psmet.loc
Merge branch 'master' of https://github.com/goper/psmet.loc