added facebook login
Std search
remove comments
Merge branch 'master' into ravi_work

Conflicts:
	app/models/customer_management.rb
merge errors
facebook and login integration. Need to fix login problem
faceboo and login integration
fixing login issue
fixing layout and added fb login css
modified login page
small changes
Merge branch 'master' into ravi_work

Conflicts:
	config/routes.rb
fixing merging
Activity Log and Admin Customer integration half
Merge branch 'master' into ravi_work

Conflicts:
	app/controllers/application_controller.rb
Fifxing activity log merge issues
Merge branch 'master' into ravi_work

Conflicts:
	app/controllers/application_controller.rb
customer & customer management integration
Merge branch 'master' into ravi_work

Conflicts:
	app/views/products/show.html.erb
intermediate checkin: customer_group/lead show updated. cart page layout