* add Channel package skeleton
* add SharedStore Package
* implement Channel object and BaseChannel class, PresenceChannel trait
* fix PresenceData method
REST API Server
Channel functional requirement implements complete
* implement private channel
* add to signature function to get before encryption string
* add encryption util class in java
Add Event.scala and fix SharedStore syntax errors
package naming
package naming
package renaming
package renaming, add conf.json
Merge remote-tracking branch 'origin/channel'

* origin/channel:
  Add Event.scala and fix SharedStore syntax errors
  Channel functional requirement implements complete * implement private channel * add to signature function to get before encryption string * add encryption util class in java
  * implement Channel object and BaseChannel class, PresenceChannel trait * fix PresenceData method
  * add SharedStore Package
  * add Channel package skeleton
Refactoring channel publish event
Merge branch 'channel'

* channel:
  Refactoring channel publish event
* "package renamed"
Merge branch 'api-server'

Conflicts:
	conf.json
	src/main/scala/HttpServerManager.scala
	src/main/scala/HttpVerticle.scala
	src/main/scala/org/jokbal/pusher/RestAPI/HttpServerManager.scala
	src/main/scala/org/jokbal/pusher/RestAPI/HttpVerticle.scala
	src/main/scala/org/jokbal/pusher/http/HttpServerManager.scala
	src/main/scala/org/jokbal/pusher/http/HttpVerticle.scala
Merge branch 'master' of github.com:JokBal/mod-pusher

Conflicts:
	conf.json
	gradle.properties
	src/main/resources/mod.json
Repackaging
Merge branch 'master' of https://github.com/JokBal/mod-pusher

# By tokirin11117
# Via tokirin11117
* 'master' of https://github.com/JokBal/mod-pusher:
  * "package renamed"
  package renaming, add conf.json
  package renaming
  package naming
  package naming
  REST API Server
rename Model package to model
Merge branch 'master' into connection-module

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