Right management
Merge remote-tracking branch 'origin/dev' into schemas

Conflicts:
	application/libraries/XmlInterfacer.php
Merge remote-tracking branch 'origin/dev' into schemas
Merge remote-tracking branch 'origin/schemas' into dev