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
[#e1] Refactoring and initial devise config

Conflicts:
	app/assets/javascripts/contact.js.coffee
	app/views/backbone/_form.html.erb
	app/views/contact/index.html.erb
Merge branch 'feature/8_posts_archive' into feature/9_contact_us

Conflicts:
	app/helpers/application_helper.rb
Merge branch 'feature/9_contact_us' into extra/1_login_popup

Conflicts:
	app/views/landing/index.html.erb
Merge branch 'extra/1_login_popup' into extra/2_integration_tests