news page now uses contentEdit twig
added more steps in our bdd
making bdd test for photos page
add bdd test for Photos page and a text image
Merge branch 'musicPlayer' into integration

Conflicts:
	features/ContentPage.feature
Merge branch 'integration' of https://github.com/agilemusicproject/agilemusicproject.com into integration
Fixed bug with meettheband photo upload