lk_profil lk_message
Merge branch 'master' of github.com:mokujin90/miledy

Conflicts:
	css/style.css
	css/style.css.map
	protected/controllers/SiteController.php
	sass/style.scss