Finished feature 6.
Merge branch 'dev' of https://github.com/TheThinkTank/ARepo into dev