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

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

Conflicts:
	application/cache/7f/7f86f94a34cffdd1f895b6c2a720f1bb3a846348.txt
	application/cache/a4/a4b50012e9a6c5200c40dc59b07a59c958d72207.txt