Fixed problem while adding "Target"
(https://www.pivotaltracker.com/story/show/31341507)
Made the database url & credentials configurable in the standard
properties
another addition to gitignore
Adding Realized/Targeted option to Pivot reports (issue
https://www.pivotaltracker.com/story/show/20006101)
fixes the testconnectionprovider for use on Jenkins (when there's no properties file at all)
Migrates from log4j to juli

Conflicts:

	server/src/main/java/org/activityinfo/server/command/authorization/CreateSiteAuthorizationHandler.java
	server/src/main/java/org/activityinfo/server/database/hibernate/HibernateConnectionProvider.java
	server/src/main/java/org/activityinfo/server/report/renderer/image/ImageMapRenderer.java
Restructures the server side handling of commands to properly handle mixed sync/async commands

Conflicts:

	server/src/main/java/org/activityinfo/server/database/ServerDatabaseModule.java
	server/src/main/java/org/activityinfo/server/database/dao/UserDAO.java
	server/src/main/java/org/activityinfo/server/endpoint/gwtrpc/ServerExecutionContext.java
	server/src/test/java/org/activityinfo/server/endpoint/gwtrpc/ServerExecutionContextTest.java
Tunes logging
Checks for null in confirm user profile function
Fixes encoding parameter for unit tests
additional fix for error when saving a new report (issue https://www.pivotaltracker.com/story/show/34929389)
small fix to make the pivottest run correctly (quarter with 'T' changed
into 'Q')
Merge branch 'activityinfo-2.6' of github.com:akbertram/activityinfo into activityinfo-2.6
Assures that the ServerExecutionContext is cleaned up if the commit fails to start.
Merge branch 'activityinfo-2.6' into appengine

Conflicts:
	server/src/main/java/org/activityinfo/ActivityInfoCore.gwt.xml
	server/src/main/java/org/activityinfo/ActivityInfoProduction.gwt.xml
	server/src/main/java/org/activityinfo/server/attachment/AttachmentServlet.java
	server/src/main/java/org/activityinfo/server/bootstrap/AbstractController.java
	server/src/main/java/org/activityinfo/server/command/authorization/CreateSiteAuthorizationHandler.java
	server/src/main/java/org/activityinfo/server/database/DatabaseFilter.java
	server/src/main/java/org/activityinfo/server/database/MySqlConfig.java
	server/src/main/java/org/activityinfo/server/database/ServerDatabaseModule.java
	server/src/main/java/org/activityinfo/server/database/hibernate/HibernateConnectionProvider.java
	server/src/main/java/org/activityinfo/server/database/hibernate/HibernateExecutor.java
	server/src/main/java/org/activityinfo/server/database/hibernate/HibernateModule.java
	server/src/main/java/org/activityinfo/server/endpoint/gwtrpc/ServerExecutionContext.java
	server/src/main/java/org/activityinfo/server/report/renderer/image/ImageMapRenderer.java
	server/src/main/java/org/activityinfo/server/schedule/ReportMailer.java
	server/src/main/java/org/activityinfo/server/util/logging/LoggingInterceptor.java
	server/src/main/java/org/activityinfo/shared/command/handler/pivot/PivotQuery.java
	server/src/main/resources/log4j.properties
	server/src/test/java/org/activityinfo/server/command/CommandTestCase2.java
	server/src/test/java/org/activityinfo/server/database/TestConnectionProvider.java
	server/src/test/java/org/activityinfo/test/MockHibernateModule.java