reports corrected..
Merge branch 'master' of https://github.com/rshiva/pharmareport

Conflicts:
	app/controllers/reports_controller.rb
	app/views/appointments/_survey_report.html.erb
	app/views/appointments/show.html.erb
	config/database.yml
	config/routes.rb
ui added.. few fixes ..
Merge branch 'master' of https://github.com/sudhirsb2003/pharmareport

Conflicts:
	config/database.yml