Merge pull request #1 from clockfly/master

sync from clockfly/gearpump
Merge pull request #2 from intel-hadoop/master

merge with intelhadoop/gearpump
add user's resource request config
refactor code
Merge branch 'master' into scheduler

Conflicts:
	core/src/main/scala/org/apache/gearpump/cluster/AppManager.scala
	core/src/main/scala/org/apache/gearpump/scheduler/PriorityScheduler.scala
	core/src/main/scala/org/apache/gearpump/scheduler/Resource.scala
	core/src/main/scala/org/apache/gearpump/scheduler/Scheduler.scala
	core/src/main/scala/org/apache/gearpump/util/Configs.scala
	src/main/scala/org/apache/gearpump/cluster/scheduler/PriorityScheduler.scala
	src/main/scala/org/apache/gearpump/cluster/scheduler/Resource.scala
	src/main/scala/org/apache/gearpump/cluster/scheduler/Scheduler.scala
	src/main/scala/org/apache/gearpump/scheduler/PriorityScheduler.scala
	src/main/scala/org/apache/gearpump/scheduler/Resource.scala
	src/main/scala/org/apache/gearpump/scheduler/Scheduler.scala
change resource on worker to be configurable
add kafka conf file
remote zombie codes
Merge pull request #66 from huafengw/workerResource

change resource on worker to be configurable
Merge pull request #67 from manuzhang/add_kafka_conf_file

Add kafka conf file
add dependency of examples into core/build.sbt until we resolve #30
update README.md to document that you need to run 'sbt clean publishLocal pack'
Remove circular dependency but add hardcoded reference to examples lib for local, master, worker. Temporary workaround until we can pass the jar (or jar path) to the master and have it loaded dynamically
add entire path of examples so this works with kafkawordcount (which references zookeeper, kafka, etc)
Fixes #45 - elimination of duplicate jars won't be available in sbt-pack until 0.6.3 I believe. We can update sbt-pack at that time.
Merge pull request #68 from kkasravi/master

Add hardcoded examples jar to local, master, worker classpaths until we resolve #30
Remove unused classes, traits
first pass on #70 - somewhat painful converting AppDescription to something JSON friendly.
For wordcount a REST query of /appmaster/0?detail=true results in a JSON structure of {"appId":0,"appDescription":{"name":"wordCount","conf":[],"dag":{"vertex":["Split","Sum"],"edge":[["Split","HashPartitioner","Sum"]]}}}
use map's returned collection and convert to list