Merge branch 'master' of https://github.com/sudhirsb2003/pharmareport

Conflicts:
	app/controllers/appointments_controller.rb
	app/controllers/reports_controller.rb
Merge branch 'master' of https://github.com/sudhirsb2003/pharmareport

Conflicts:
	app/controllers/appointments_controller.rb
	app/controllers/reports_controller.rb
jquery token for adding multiple doctors and js fix
latest changes..