[#8] PR comments solved
Merge branch 'feature/8_posts_archive' into feature/9_contact_us
Merge branch 'feature/9_contact_us' into extra/1_login_popup

Conflicts:
	app/assets/javascripts/landing.js.coffee
	app/views/landing/index.html.erb