Messages and send message from profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	socnet/views.py
	static/css/base.css
	templates/socnet/base.html
	templates/socnet/friends.html
	templates/socnet/profile.html