bug fix
remove redundant function
code cleanup
code cleanup
move server app.js
Merge branch 'master' into firebaseStorage

Conflicts:
	src/server/lib/auth.js
comments
cleanup