* minor bug fix.
* trash file removed.
* connection files added.
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