Test cases updated
Company registration updated
Company registration view updated
Conflicts:
	Gemfile
	app/views/office_automation_employee/devise/registrations/new.html.haml
	spec/dummy/config/initializers/secret_token.rb
Company registration view updated
Merge branch 'master' of github.com:Shwetakale/office_automation_employee
Company registration updated
Secret token,mongoid.yml added
Merge pull request #12 from Shwetakale/master

Company registration view updated