Merge branch 'master' of C:\Users\KirbManDoon\IdeaProjects\icat with conflicts.
little bit of work on entityAttributes function