fix schema
Merge branch 'master' into feature/4_post_page

Conflicts:
	db/schema.rb
Merge branch 'feature/4_post_page'
Merge branch 'master' into feature/5_users_login
Merge branch 'feature/5_users_login'
cleanup
Merge branch 'feature/6_blog_post_comments'
Merge branch 'master' into feature/7_share_posts
[#7] Upload images per-post
Merge branch 'feature/7_share_posts' of https://github.com/savayg/buzzstarter-training into feature/7_share_posts

Conflicts:
	app/views/landing/post.html.erb
[#7] Translation and image bugfix
[#7] Switched about box position
Merge branch 'feature/7_share_posts' into release/0.0.1