changed deletion of userarchive entries from uid to user_name. On importing users they get new uids, so old entries are not deleted automatically otherwise.
fixed user-name tamper, multiple issues, fixes #AW-1626
Fix calendar entry short profile display bug
Show Calendar Admin View in Profile Form
Merge remote branch 'origin/dev-usertamper' into develop
Merge remote branch 'origin/dev_userarchive_username_patch' into develop
bugfixes
adding translations
Merge branch 'develop' of ssh://github.com/parliamentwatch/parliamentwatch into develop

Conflicts:
	sites/all/modules/custom/pw_profiles/pw_profiles.info
adding ms file display
bugfixing and move premium fields to vertical tabs
bugfixing
translations
moving php field with codex and privacy to new webform field
Merge branch 'develop' of ssh://github.com/parliamentwatch/parliamentwatch into develop
add functionality to set custom breadcrumb and custom page title for user revisions
AW-1637 delete page title php field
AW-1481 adding translation for one-time login
changed text
AW-1481 #comment adding translation