update translation files from transifex [skip ci]
#1234 - View Entries: Custom Registration Form
fix favicon link for jordy template
change default LANGUAGE_CODE and language from en-us to en
version bump
merge with the latest master and fix conflicts