TEMP STATE
Merge branch 'develop' of github.com:serieznyi/kohana-frontend into develop

Conflicts:
	README.md