I accidentally added changes to the root view instead of the client, so
I fixed that in this commit.
Removed previously duplicated files
Deleted file lint.xml

Left over from when I deleted the duplicated files in the project root.
Merge remote-tracking branch 'origin/master' into develop