github - УГ =(
Merge branch 'master' of github.com:GT-Volk/fit4pride

Conflicts:
	protected/views/calculators/index.php
	protected/views/calculators/kalkulyator_kalorij.php