Merge branch 'dev' into Ark
Add Coding Standards
Merge branch 'Ark' into dev