Merge branch 'hotfix/dont_views_not_confirmed_users'

* hotfix/dont_views_not_confirmed_users:
  add access to not_accepted users
Merge branch 'develop'

* develop:
  add edit works
  add file size validator
  add ui to work
  rename esse to work
  add esse controller
  add esse
  add esse model
Merge branch 'develop'

* develop:
  fix something
Merge branch 'develop'

* develop:
  add some tests
  remove report functions for user
  add some tests
Merge branch 'develop'

* develop:
  edit compeition
  remove bad code from user office
  fix users form
  allow user to change email and password
  edit placeholder for password
Merge branch 'develop'

* develop:
  make up done
  beautiful look
some features
remove min.vn.pol
Merge branch 'hotfix/remove_min_vn_pol' into develop

* hotfix/remove_min_vn_pol:
  remove min.vn.pol

Conflicts:
	app/views/layouts/_footer.html.haml
Merge branch 'develop' of github.com:ulmic/i_am_the_lider into develop

* 'develop' of github.com:ulmic/i_am_the_lider:
  i don't mind
  bad, but stages fix
  content disposition minor fix
  stages photos float