api-server
Add Channel Data
Merge branch 'channel'

* channel:
  Add Channel Data
not changed
Merge branch 'api-devR1'

Conflicts:
	src/main/resources/mod.json
	src/main/scala/org/jokbal/pusher/connection/DataModel.scala
	src/main/scala/org/jokbal/pusher/model/DataModel.scala
	src/main/scala/org/jokbal/pusher/net/DataModel.scala
	src/main/scala/org/jokbal/pusher/verticle/Pusher.scala
asd
Merge branch 'restore'
restore wrong merge
what the
API Event Trigger, GET Request Implementation
TODO: bug fix, redis test