Merge branch 'develop' into feature/hash-routed

index.html

src/App.scss

src/App.vue

src/components/attachment/attachment.vue

src/components/conversation/conversation.vue

src/components/favorite_button/favorite_button.vue

src/components/friends_timeline/friends_timeline.vue

src/components/login_form/login_form.vue

src/components/mentions/mentions.vue

src/components/nav_panel/nav_panel.vue

src/components/notifications/notifications.vue

...ic_and_external_timeline/public_and_external_timeline.vue

src/components/public_timeline/public_timeline.vue

src/components/status/status.vue

src/components/timeline/timeline.vue

src/components/user_card_content/user_card_content.vue

src/components/user_panel/user_panel.vue

static/css/solarized-dark.css

static/css/solarized-light.css