add navbar
add navbar buttons
edit application.haml
add index welcome action
add make up to some views
add locales
add state machine story to post
add state story to post
Merge branch 'feature/make_up' into develop

* feature/make_up:
  add state story to post
  add state machine story to post
  add locales
  add make up to some views
  add index welcome action
  edit application.haml
  add navbar buttons
  add navbar
Merge branch 'develop' of github.com:JanaVPetrova/master_hunter into develop

* 'develop' of github.com:JanaVPetrova/master_hunter:
  resolve conflicts
  resolve conflicts
  add destroy button to posts
  add post-user assosiation
  add photo to post
  schema.rb
  add publish button to admin index view
  add edit and update post to admin
  add destroy button to posts
  add approving post
  many changes ololo

Conflicts:
	app/models/post.rb
	app/views/web/posts/index.html.haml
	db/schema.rb
optimize factory post