bugfix for trans tag error
version bump
Merge branch 'master' into 1301_tendenci_admin_mega_menu