Further tested and finalized CircleShape
Merge remote-tracking branch 'origin/master'
New (and functioning) server test
Rtree added
Merge branch 'master' of github.com:siigna/main
Whoops, drawing id
Draw shapes from the beginning
Black magic
Removed println statements
Documented and cleaned up the rtree implementation a bit
Implemented a lazy evaluation of the paper header to wait for the rtree to build
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/siigna/app/controller/remote/RemoteController.scala