Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
[OE-3925] - timing format changed to 24 hour clock time in measurement time
+ event type controller refactor
+ layout corrections for refactor
+ [OE-3896] manage POST for readings through the controller
+ improved validation rules
RBAC.
Merge branch 'feature/rbac' into develop
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop
Merge branch 'hotfix/OEM-109' into release/1.6

Conflicts:
	views/default/delete.php
	views/default/view.php
[OEM-109] added form declaration
[OEM-109] fixed form
Merge branch 'master' into release/1.6
+ [OE-3985] remove reference to old parsing method for readings.
+ fix to creating new readings
[OE-3984] fixed error on delete page