add sorting and other bug fixes
Merge remote-tracking branch 'upstream/master'
fix contact messages
Merge remote-tracking branch 'upstream/master'
fix contact messages
Merge remote-tracking branch 'upstream/master'
fix contact
Merge remote-tracking branch 'upstream/master'
fix recipient
Merge remote-tracking branch 'upstream/master'
fix contacts
Merge remote-tracking branch 'upstream/master'
fix labels
Merge remote-tracking branch 'upstream/master'
	modified:   app/controllers/messages_controller.rb
	modified:   app/views/pages/contact.html.erb
	modified:   app/views/pages/labs/helpdesk.html.erb