- Updated the pom and appengine.xml to match the AppEngine app ID
- Updated the pom to include the META-INF folder from the source
  tree into the generated WEB-INF/classes directory
Merge branch 'master' of https://github.com/MusicCityCenter/Backend

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/appengine-web.xml
Merge branch 'master' of https://github.com/MusicCityCenter/Backend
- Added the ability to associate images with edges