Merge branch 'refs/heads/develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed bug when you have media files with a - in their name
Merge pull request #9 from robdmoore/fix-mediahyphen-bug

Fixed bug when you have media files with a - in their name
Revert "Fixed bug when you have media files with a - in their name"
Merge pull request #10 from the-outfield/revert-9-fix-mediahyphen-bug

Revert "Fixed bug when you have media files with a - in their name"
Updated build script to allow seperation of packaging from build
Merge branch 'origin/develop'
Merge branch 'origin/master'