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
Made the photo page sort of dynamic, can add photos that get resized but cannot delete them
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
syntax error fixed in security.yml
making the music sortable in music.twig
Implemented gallery with no ability to edit captions or categories
creating page musicUpdate.twig
Changed gallery to new third party that is more flexible
musicUpdate now post the sorted data
fixed errors on adding music to database
Photos page now support editing captions and looks better