Included spatial criteria in location importer

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Explicit paths specified without -i nor -o; assuming --only paths...
# On branch version3
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   server/pom.xml
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   server/src/main/java/org/activityinfo/api/shared/adapter/ActivityAdapter.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/.name
#	.idea/artifacts/
#	.idea/compiler.xml
#	.idea/copyright/
#	.idea/encodings.xml
#	.idea/libraries/
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/scopes/
#	.idea/uiDesigner.xml
#	.idea/vcs.xml
#	.idea/workspace.xml
#	activityinfo-geodb/
#	activityinfo-parent.iml
#	geoadmin/.idea/
#	geoadmin/geoadmin.iml
#	geoadmin/pom.xml~
#	geoadmin/velocity.log
#	i18n-validator/
#	server/activityinfo-server.iml
#	server/libpeerconnection.log
Fixed gwt compilation problem

Collector was used in client code
Renamed analysis module -> reports