Add module training
back default file
commit config/env/dev.php
Merge branch 'master' of https://github.com/Jurets/smart_lp1

Conflicts:
	backend/views/layouts/main.php
	common/config/main.php
Merge branch 'master' of https://github.com/Jurets/smart_lp1
add file migration
commit
Merge branch 'master' of https://github.com/Jurets/smart_lp1
Merge branch 'master' of https://github.com/Jurets/smart_lp1
Add module Cities
Change size fields of search. Add UploadHandler(don't work yet)
commit
Add training migration
add module cities
Merge branch 'master' of https://github.com/Jurets/smart_lp1

Conflicts:
	common/config/main.php