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