Added the ability for medtech admins to mask as any user from the "Manage Users" page. Refs #223.
Merge branch 'develop' of https://github.com/EntradaProject/entrada-1x into feature-masquerade

Conflicts:
	www-root/setup/upgrade/1606/entrada.sql
Brought the user masquerade functionality up to date with current database changes and added the `acl_permissions` record from the update scripts to the install sql.
Issue #316 - allow octal and hexidecimal encoded entities to converted to UTF-8
Merge branch 'develop' into feature-masquerade
Ref #127 This was already actually fixed compared to what is mentioned in the ticket, but I changed things so it shows the "clear custom text" option if an objective is changed at all, and removes it if clicked (or if the text is cleared otherwise) rather than requiring a new pageload for it to be added or removed from the interface.
Minor variable name changes, and a change to the user_access SQL query.
Merge branch 'develop' into feature-masquerade
Minor update to 1606 which had the wrong db version defined.
Merge pull request #404 from EntradaProject/feature-masquerade

Added the ability for medtech admins to mask as any user from the "Manag...
Moved most recent database upgrade script to go directly after the current version rather than skipping past two other upgrade versions to maintain consistency regarding version numbers and when things were merged into develop.
Merge branch 'develop' into feature-assessment-events
Finish functionality for attaching learning events to assessments. Refs #392