home firs commit
Merge branch 'master' of https://github.com/den-otto/dietagram

Conflicts:
	css/slider.css
	css/style.css
	css/table-images/apple.png
	protected/controllers/AccountController.php
	protected/controllers/AjaxController.php
	protected/views/account/index.php
	protected/views/layouts/main.php
	protected/views/site/index.php
форма с личными данными