Merge branch 'release-1.5' into develop

Merging in version changes.
Developing a new build process.
Removing old Grunt file.
Merge branch 'develop'

Merging in new build process.