Merge branch 'dev' into images
add comments controller
add counter_cache for comments
add validation & error view
fix comments & likes
Merge branch 'images' into user
comment small fixes
add FaceBook reg
add category subscribe
add mailer
Merge branch 'user' into dev
Merge branch 'images' into dev
Merge branch 'dev' into active_admin