OI-177

Changed filenames for dataaccess and template since it was causing errors on Linux when trying to deploy.
OI-250
OI-223
OI-225
OI-242
OI-230. OI-231, OI-232
Merge branch 'version-2.2.70'