pavel 6.11.2014
Merge branch 'master' of https://github.com/interdate/tnt-moco

Conflicts:
	composer.json
	src/TNTMOCO/AppBundle/Entity/User.php
	web/assets/css/backend.css
Merge branch 'master' of https://github.com/interdate/tnt-moco