Give reps ability to upload photos
Merge branch 'master' of github.com:askaway/askaway into feature/pretty-pictures

Conflicts:
	app/views/users/edit.html.haml
	app/views/users/show.html.haml
Fix failing spec
Change upload button text
Uploaded avatars: no larger than 5 MB.
Move uploadable avatar stuff into a concern
Move uploaded_avatar specs into separate file
Merge pull request #109 from askaway/feature/pretty-pictures

Feature/pretty pictures
Add https to uploaded images
Improve upvote styling
Tweak question body styles
Merge pull request #110 from askaway/style-upvote

Improve upvote styling
Tweak upvote styles
dont use glyphicons
Add party avatars
Remove avatar upload duplication.
Merge pull request #112 from askaway/feature/party-page

Add party avatars
Merge branch 'master' into about-page

Conflicts:
	app/assets/stylesheets/application.css.scss