Merge branch 'master' of github.com:Baziak/php-education-project into develop
add profileAction & User model
merge with JohnnySk
modify css
Merge branch 'develop' of github.com:blackAcid/php-education-project into develop
modify acl
Merge pull request #15 from blackAcid/master

modify css files and acl.php