-Added user approval and pre-approval by admins
-Improved email registration/confirmation
Merge branch 'master' of https://github.com/NoBrainer/MyApp.git

Conflicts:
	app.js
	models/user-model.js
	routes/user.js