Merge branch 'hotfix/add_helper_current_user_decorator'

* hotfix/add_helper_current_user_decorator:
  add current_user_decorate helper
staging user changed
Merge branch 'hotfix/staging_database' into develop

* hotfix/staging_database:
  staging user changed
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku: