added music to music.twig and removed unneeded code
added musicEdit.twig
Merge branch 'integration' into musicPlayer
add MusicContentDAO.php, MusicPageController.php, MusicPageFormFactory.php
basic format for music page
implementing MusicContentDAO and FormFactory
the start for behat test for music
ordering for embeds on music
took out rich text editor from music edit form
add exception for duplicate music song order and changed catch statements to all Exceptions
Merge branch 'musicPlayer' into integration

Conflicts:
	config/security.yml
	web/index.php