friends list deny, add friends fixed
Merge branch 'master' of https://github.com/guymorita/hatch

Conflicts:
	www/partials/inboxView.html
added login fixes and friend list fixes