Merge branch 'hotfix-0.6.4'
Merge branch 'release-0.6.5'
Merge branch 'release-0.6.6'
Merge branch 'release-0.6.6'
Prepare 0.6.7 release
Merge branch 'release-0.6.7'
Merge branch 'release-0.6.8'

Conflicts:
	bin/common.sh
	build.sbt
	dist/bin/backup
	dist/bin/common.sh
	dist/bin/restore
	dist/bin/updatecheck
	dist/bin/upgrade
	dist/conf/init.json
	servers/admin/build.sbt
	servers/api/build.sbt
	servers/scheduler/build.sbt
	servers/scheduler/conf/application.conf
	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
Merge branch 'release-0.7.0'
Bump version to 0.7.0-jo1-SNAPSHOT
PDIOE-8 Add JVM options to single machine Mahout kNN item based CF
PDIOE-8 Pass environment properly
PDIOE-9 Support Hadoop split size and # reducers
PDIOE-10 Batch ItemRecScore insertion
PDIOE-9 Fix Hadoop options location in command line
PDIOE-11 Increase Mongo-Hadoop input split size from 8MB to 64MB
PDIOE-9 Fix Hadoop options position in Mahout job command line
PDIOE-9 Add mapper configuration
PDIOE-15 Change to while loop
Merge remote-tracking branch 'experimental/jo' into develop

Conflicts:
	bin/common.sh
	build.sbt
	commons/src/main/scala/io/prediction/commons/modeldata/mongodb/MongoItemRecScores.scala
	dist/bin/common.sh
	dist/conf/init.json
	servers/admin/build.sbt
	servers/api/build.sbt
	servers/scheduler/build.sbt
	servers/scheduler/conf/application.conf
	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