Merged the modal and tooltip code
Merge branch 'master' of https://github.com/RandomlyKnighted/Groundwork
Merged the modal and tooltip code