Lots of changes and refinements to the alpha front end...
Missed Music template in the add
Merge pull request #849 from sinfuljosh/master

Lots of changes and refinements to the alpha front end...
Merge pull request #80 from nZEDb/master

Lots of changes and refinements to the alpha front end...