updated symfony requirements and composer file for upgrade to 2.1.8 (i think)
Merge branch 'master' of git@github.com:simonpkerr/music-memories.git
started to install sonata admin bundle but need to upgrade project
to symfony 2.2.
Merge branch 'adding-admin' of git@github.com:simonpkerr/music-memories.git

Conflicts:
	composer.lock
- upgraded project to symfony 2.2
- fixed issues with invalid entities, and deprecated calls in templates
- begun integrating sonata user bundle but still needs work to integrate
with already extended user entity.
continued work on integrating sonata user bundle.
updated user entity but still need to update certain fields and forms
within templates.
updates to base view to remove debug mode, set the base url for assets
and rename the index page title and h1.
added htaccess file and updated readme.
added favicon and set up google analytics.
moved modernizr and respond.js scripts to compiled folder.
updates to base template, anomalies with certain scripts
re-added ga.js (was removed for some reason)
- moved modernizr and respond scripts (again)
re-added correct favicon
updated validation for forms to use the Length attribute.
updated some entity values but not working yet.
- amends to style of forms to make them look better mobile style.
- continued dev to get sonata user bundle working.
got some basic functionality of sonata user bundle working.
can now show list of users but can't edit. edit is still trying to use
the wrong entity.
moved the edit and show views for profile into the Application folder.
updated the change password views and controller to redirect to the right
route.
got user admin working. just swapped base class out on my user entity to
the sonata entity and everything worked.
slight amend to wide stylesheet.
re-worked issues with the profile forms. not using the right ones,
tests nearly working but not validating the correct password.
need to use the fos user profile views and handles but at the moment
 is using the sonata ones.
finished adding user admin. admin still needs skinning but basic
functionality in place.
added google verification file for webmaster tools.