Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/appengine-web.xml
Admin panel
Merge remote-tracking branch 'origin/master'