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...
Change from bootstrap Col-* to css style and float to be backward compatible with default template.
Merge pull request #850 from sinfuljosh/master

Change from bootstrap Col-* to css style and float to be backward compat...
Merge remote-tracking branch 'remotes/origin/master' into dev