Fixing tests..
Merge branch 'dev' of https://github.com/mmynsted/fink into mmynsted-dev

Conflicts:
	src/test/scala/fink/JsonTests.scala
	src/test/scala/fink/RestTests.scala
Fixing tests..