Pull short id generation into separate class
Use new ShortId class to generate short id
add support for viewing sent private messages
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/models/user.rb