major updates
Merge branch 'master' of github.com:codybutz/codehub

Conflicts:
	models/User.js
	models/UserGroup.js
	package.json
	public/css/bootstrap.css
	public/js/bootstrap.js
	public/js/bootstrap.min.js
	routes/auth.js
	routes/index.js
	routes/profile.js
	views/about.jade
	views/auth/login.jade
	views/auth/register.jade
	views/inc/header.jade
	views/inc/scripts.jade
	views/index.jade
	views/layout.jade
	views/message.jade
	views/profile/index.jade
	views/profile/profileLayout.jade