cleanup
cleanup
fix gitignore
Merge branch 'feature/7_share_posts'
Merge branch 'master' into feature/8_posts_archive

Conflicts:
	app/uploaders/default_image_uploader.rb
	app/uploaders/posts_image_uploader.rb