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
Merge branch 'develop' of ssh://github.com/parliamentwatch/parliamentwatch into develop

Conflicts:
	sites/all/modules/custom/pw_profiles/pw_profiles.info
Merge branch 'develop' of ssh://github.com/parliamentwatch/parliamentwatch into develop