Merge commit '29e40bacc6ba72c687aa28fa964380c131feeb3a' into develop
Moved a few files around in preparation for submitting to asset store