Merge branch 'dev'
assets precompiled
Added abilities for admins and users
Update index.html.haml
Update users.rb
Update links.rb
Create categories.rb
working on regstration
Merge branch 'master' into dev
solved merge conflicts