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
improve imports
add code to restart tasks
add task recovery code
update log
fix bug
fix serialization bugs
fix clocking bug
fix clocking
fix bug in tracking the clock
Merge pull request #71 from kkasravi/master

REST API to retrieve a given AppMasters DAG
add recovery code
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	streaming/src/main/scala/org/apache/gearpump/streaming/AppMaster.scala
fix merge conflict
Merge pull request #79 from clockfly/master

at least once