Hide the 'Note' text if we're in mobile view
Hide the picture text if we're in mobile view
Show an image even if they never uploaded one
Move messages link to message drop-down
Correct field for activity lookup
Merge branch 'master' of github.com:e14n/pump.io
Merge remote-tracking branch 'upstream/master' into pump.jpope.org

Conflicts:
	public/template/nav-loggedin.utml