Manage courses and manage batches
Merge branch 'master' of github.com:asif-meer/sms

Conflicts:
	app/controllers/configuration_controller.rb
	config/routes.rb
Merge branch 'master' of github.com:asif-meer/sms