Merge the aspect dropdown in the publisher with master, some things are still broken

app/controllers/people_controller.rb

app/helpers/aspect_global_helper.rb

app/views/aspect_memberships/_aspect_dropdown_list_item.haml

app/views/aspects/_aspect_stream.haml

app/views/aspects/create.js.erb

app/views/aspects/index.mobile.haml

app/views/contacts/sharing.haml

app/views/notifications/index.html.haml

app/views/people/_relationship_action.haml

app/views/people/_sub_header.html.haml

app/views/people/aspect_membership_dropdown.haml

app/views/services/_remote_friend.html.haml

app/views/shared/_aspect_dropdown.html.haml

app/views/shared/_publisher.html.haml

app/views/status_messages/bookmarklet.html.haml

app/views/status_messages/new.haml

config/assets.yml

config/locales/diaspora/en.yml

features/posts.feature

features/step_definitions/custom_web_steps.rb