Finish messaging to friends
Merge branch 'master' of github.com:sreisner/socialnetwork

Conflicts:
	friends/templates/friends/index.html