Enter media URL and Mimetype on the UI
Merge branch 'master' of https://github.com/csabakassai/city-guide-for-glass
Merge branch 'master' of https://github.com/csabakassai/city-guide-for-glass

Conflicts:
	src/main/webapp/WEB-INF/appengine-web.xml