Merge pull request #660 from sergeyklay/feature-bootstrap-3

Minor fixes
Fixed issue: Fixed adding and changing user roles for admin