Update feature
Merge branch 'master' of https://github.com/mitaliswain/WMSService

Conflicts:
	app/models/global_configuration.rb
	test/models/global_configuration_test.rb