#1123 initial update on converting strings translation ready
Merge branch 'master' of https://github.com/tendenci/tendenci into 1123_convert_strings_to_translation_strings
Merge branch 'master' into 1123_convert_strings_to_translation_strings
added updates for articles module
merge with the latest master and fix conflicts; add tranlations to the updated articles module
added updates upto corporate_memberships module
Merge branch 'master' into 1123_convert_strings_to_translation_strings
finalize translations upto corporate_memberships module
added update upto py files of events module
event templates up to registrants
fix syntax errors
updates upto wizard.html on events module
merge with the latest master and fix merge conflicts
added translation updates upto jobs module
Merge branch 'master' into 1123_convert_strings_to_translation_strings
added translations upto locations module
updated upto parts of membership app
Merge branch 'master' into 1123_convert_strings_to_translation_strings
update upto news module
merge with the latest master