add more comments
extract scheduler implementation and abstract resource respresentation
refactor resource related code
temporary commit
refactor code
continue refactor code
refactor
minor fix
fix local mode master proxy bug
fix config override issue
add explicit message of worked added and terminated
Merge branch 'master' into GearpumpResourceScheduler

Conflicts:
	src/main/resources/application.conf
	src/main/scala/org/apache/gearpump/cluster/AppManager.scala
	src/main/scala/org/apache/gearpump/cluster/Master.scala
Update Local.scala
Add global clock service
minor fix
rename the file
remove useless code
Merge pull request #48 from huafengw/GearpumpResourceScheduler

Gearpump resource scheduler
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/clockfly/gearpump

Conflicts:
	src/main/scala/org/apache/gearpump/cluster/main/Local.scala