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

Conflicts:
	.gitignore
	application/cache/a4/a4b50012e9a6c5200c40dc59b07a59c958d72207.txt
	application/cache/de/de85f8ed508f1a67cc33bf5089922242b88e15bc.cache
	application/views/index/carcass.php
Merge branch 'master' of https://github.com/goper/psmet.loc

Conflicts:
	.gitignore
	application/cache/a4/a4b50012e9a6c5200c40dc59b07a59c958d72207.txt
	application/cache/de/de85f8ed508f1a67cc33bf5089922242b88e15bc.cache
	application/views/index/carcass.php