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
Merge branch 'master' into scheduler

Conflicts:
	core/src/main/scala/org/apache/gearpump/cluster/Worker.scala
	core/src/main/scala/org/apache/gearpump/cluster/scheduler/PriorityScheduler.scala
	core/src/main/scala/org/apache/gearpump/cluster/scheduler/Scheduler.scala
	core/src/main/scala/org/apache/gearpump/util/Configs.scala
	core/src/main/scala/org/apache/gearpump/util/Constants.scala
	streaming/src/main/scala/org/apache/gearpump/streaming/AppMaster.scala
	streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala
revert WorkerInfo changes
Merge branch 'master' into scheduler

Conflicts:
	streaming/src/main/scala/org/apache/gearpump/streaming/AppMaster.scala
	streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala
	streaming/src/main/scala/org/apache/gearpump/streaming/Executor.scala
refactor AppMaster
add TaskLocator
Merge branch 'master' into scheduler

Conflicts:
	streaming/src/main/scala/org/apache/gearpump/streaming/AppMaster.scala
add TaskSet and refactor PriorityScheduler
minor fix
Merge branch 'master' into scheduler

Conflicts:
	core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala
typo
Merge pull request #64 from huafengw/scheduler

Scheduler