Merge branch 'release-0.6.0' into develop
Bump to 0.7.0-SNAPSHOT
Merge branch 'hotfix-0.6.1' 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
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
PDIO-232 Upgrade to sbt 0.13.0 and Play 2.2.0 with major sbt project structure cleanup
PDIO-232 Add missing file
PDIO-232 Include process assembly to root sbt project
PDIO-228 #comment update admin routes
PDIO-228 #comment change auto tuned_algo_id to post param
PDIO-232 Fix broken test due to Play framework updates
Merge branch 'develop' of github.com:PredictionIO/PredictionIO into develop
PDIO-228 #comment standardize json field name convention
PDIO-228 standardize admin json field name convention
PDIO-232 Partial sbt refactor. Separate Play compiles.
Merge branch 'develop' of github.com:PredictionIO/PredictionIO into develop
PDIO-228 #comment clean up id name
PDIO-232 Fix sbt assembly dependencies
Merge branch 'develop' of github.com:PredictionIO/PredictionIO into develop
PDIO-232 Add sbt pack
PDIO-232 Add the rest of ItemRec and ItemSim algo code