added tree for client
added tree for client
fixed some files and got npm install working properly
Merge branch 'master' into clientTree

Conflicts:
	server/controllers/users/post_login.js
	server/lib/security.js
Merge branch 'clientTree' of https://github.com/LizaHCarter/misceo into feature_servestatic
Merging changes in client tree