Diagrams
Merge branch 'master' of https://github.com/ranitz/BESTeVent

Conflicts:
	.gwt/.gwt-log
	.settings/com.google.appengine.eclipse.core.prefs
	.settings/com.google.gdt.eclipse.core.prefs
	gwt-unitCache/gwt-unitCache-000001427A628D55
	gwt-unitCache/gwt-unitCache-000001427A628F86
	gwt-unitCache/gwt-unitCache-000001427A628FC5
	gwt-unitCache/gwt-unitCache-000001427A62914B
	gwt-unitCache/gwt-unitCache-000001427A62935D
	gwt-unitCache/gwt-unitCache-000001427A76B84F
	war/WEB-INF/lib/appengine-api-1.0-sdk-1.8.7.jar
	war/WEB-INF/lib/appengine-api-labs.jar
	war/WEB-INF/lib/appengine-endpoints.jar
	war/WEB-INF/lib/appengine-jsr107cache-1.8.7.jar
	war/index.html
	war/login.html