user authentication
Merge branch 'office' of github.com:andrew222/Site-Tools into office

Conflicts:
	Gemfile
	config/application.rb
	config/mongoid.yml
MISC - Add thin server