Merge branch 'hotfix/locales_bugs' into develop

* hotfix/locales_bugs:
  fix wrong login
  test fixing
  test fixed
  jquery compile
  fotorama compiling
  fixing db encoding error
  login fixing
Merge branch 'hotfix/other_fixes' into develop

* hotfix/other_fixes:
  fix bug with force
  add links
  change end_registration_time
Merge branch 'hotfix/other_fixes2' into develop

* hotfix/other_fixes2:
  fix bug with birthday
  remove duplicate info
master cleaning
Merge branch 'hotfix/master_cleaning'

* hotfix/master_cleaning:
  master cleaning
Merge branch 'hotfix/master_cleaning' into develop

* hotfix/master_cleaning:
  master cleaning
Merge branch 'develop' of github.com:ulmic/deadline_camp into develop

* 'develop' of github.com:ulmic/deadline_camp:
Merge branch 'release/master_clean'

* release/master_clean: