Merge branch 'master' into user-authentication

Added authentication routes to new routes/auth.js
Conflicts:
	routes/api.js
	routes/index.js
	server.js