Yanna | add categories
Merge branch 'master' into cat

Conflicts:
	app/controllers/users_controller.rb
	app/mailers/user_mailer.rb
	app/views/layouts/_header.html.erb
	app/views/user_mailer/notification_deactivate_user.html.erb
	app/views/user_mailer/notification_deactivate_user.text.erb
	db/schema.rb
Yanna | handle empty categories
refine header
show hot item on item list | add view_count column to item
show hot on item detail page
Rohan | New user activation
Rohan | New user activation
Rohan | New user activation
Email broadcast to users
add for_auction option to item