Merge branch 'hotfix-0.5.0-config'
Merge branch 'develop'
Bump to version 0.5.2
PDIO-212 Use Apache archive instead of mirrors
Merge branch 'hotfix-0.5.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/start-scheduler.sh
	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/hadoop/scalding/generic/build.sbt
	process/engines/itemrec/algorithms/hadoop/scalding/knnitembased/build.sbt
	process/engines/itemrec/algorithms/hadoop/scalding/latestrank/build.sbt
	process/engines/itemrec/algorithms/hadoop/scalding/mahout/build.sbt
	process/engines/itemrec/algorithms/hadoop/scalding/randomrank/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/hadoop/scalding/metrics/map/build.sbt
	process/engines/itemrec/evaluations/hadoop/scalding/trainingtestsplit/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/algorithms/hadoop/scalding/itemsimcf/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/migration/0.5/appdata/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