коммит перед закачкой с сервера
Merge branch 'origin/master'

Conflicts:
	composer.json
	composer.lock
	composer.phar
	vendor/phpixie/auth/assets/views/auth/oauth.php
	vendor/phpixie/auth/classes/PHPixie/Auth.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Controller/Facebook.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Login/Facebook.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Login/Password.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Login/Provider.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Role/Driver.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Role/Field.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Role/Relation.php
	vendor/phpixie/auth/classes/PHPixie/Auth/Service.php
	vendor/phpixie/auth/composer.json
	vendor/phpixie/auth/tests/auth/authTest.php
	vendor/phpixie/auth/tests/auth/controller/facebookTest.php
	vendor/phpixie/auth/tests/auth/login/facebookTest.php
	vendor/phpixie/auth/tests/auth/login/passwordTest.php
	vendor/phpixie/auth/tests/auth/role/fieldTest.php
	vendor/phpixie/auth/tests/auth/role/relationTest.php
	vendor/phpixie/auth/tests/auth/serviceTest.php
	vendor/phpixie/auth/tests/bootstrap.php
	vendor/phpixie/auth/tests/files/sessionStub.php
	vendor/phpixie/auth/tests/phpunit.xml
	vendor/phpixie/validate/classes/PHPixie/Validate.php
	vendor/phpixie/validate/classes/PHPixie/Validate/Validator.php
	vendor/phpixie/validate/composer.json
	vendor/phpixie/validate/tests/bootstrap.php
	vendor/phpixie/validate/tests/phpunit.xml
	vendor/phpixie/validate/tests/validate/validateTest.php
	vendor/phpixie/validate/tests/validate/validatorTest.php
	web/gmp.png
сделана проверка пользователя и получения его роли.
создан вью для неавторизованного пользователя
новая концепция доступа - по уровням доступа