Merge branch 'hotfix-0.6.1'
PDIO-220 #comment fix the item sim engine name
Bump version to 0.6.2
PDIO-199 #comment filter out seen item in mahout's predicted results
PDIO-222 Prompt to stop Hadoop if installed in vendors area
PDIO-225 support update email and change password in users tool
Merge branch 'hotfix-0.6.2' of github.com:PredictionIO/PredictionIO into hotfix-0.6.2
PDIO-224 Fix geolocation support in commons
Merge branch 'hotfix-0.6.2' of github.com:PredictionIO/PredictionIO into hotfix-0.6.2
PDIO-224 More tests for geo
PDIO-224 Geo queries at output
PDIO-224 Fix API queries with geo and add tests
PDIO-224 Top K items collectors use new API
Merge branch 'hotfix-0.6.2' into develop

Conflicts:
	bin/common.sh
	commons/build.sbt
	dist/bin/backup
	dist/bin/common.sh
	dist/bin/conncheck
	dist/bin/migration/appdata
	dist/bin/restore
	dist/bin/settingsinit
	dist/bin/updatecheck
	dist/bin/upgrade
	dist/bin/users
	dist/conf/init.json
	dist/conf/predictionio.conf
	output/build.sbt
	process/commons/hadoop/scalding/build.sbt
	process/engines/itemrec/algorithms/hadoop/scalding/build.sbt
	process/engines/itemrec/algorithms/scala/mahout/build.sbt
	process/engines/itemrec/algorithms/scala/mahout/commons/build.sbt
	process/engines/itemrec/evaluations/hadoop/scalding/build.sbt
	process/engines/itemrec/evaluations/scala/paramgen/build.sbt
	process/engines/itemrec/evaluations/scala/topkitems/build.sbt
	process/engines/itemrec/evaluations/scala/trainingtestsplit/build.sbt
	process/engines/itemsim/algorithms/hadoop/scalding/build.sbt
	process/engines/itemsim/evaluations/hadoop/scalding/build.sbt
	process/engines/itemsim/evaluations/scala/topkitems/build.sbt
	servers/admin/project/Build.scala
	servers/api/project/Build.scala
	servers/scheduler/conf/application.conf
	servers/scheduler/project/Build.scala
	tools/conncheck/build.sbt
	tools/settingsinit/build.sbt
	tools/softwaremanager/build.sbt
	tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Backup.scala
	tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Restore.scala
	tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/UpdateCheck.scala
	tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Upgrade.scala
	tools/users/build.sbt