#2 - UI page for sign in page
Merge branch 'master' into master_enhancement_2

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml
	config/routes.rb
Merge pull request #7 from subhash-shah-kcspl/master_enhancement_2

Admin > UI Using Boostrap 3 - Sign in Page
Merge branch 'master' into master_6