REST API Server
package naming
package naming
package renaming
package renaming, add conf.json
* "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