fix favicon link for jordy template
change default LANGUAGE_CODE and language from en-us to en
version bump
Merge branch 'master' into 1123_convert_strings_to_translation_strings