Merge branch 'active_admin' into images
add picture category
Merge branch 'images' into dev
add devise User
add device views
add like model
add categories controller
Merge branch 'user' into dev
Merge branch 'dev' into images
add counter for picture in categories
fix controller & views
Merge branch 'images' into dev
Merge branch 'dev' into user
fix style and add pagination views
create User login form & redirect
add likes controller
add comment model
Merge branch 'user' into dev
Merge branch 'dev' into active_admin