updated math model
Merge branch 'dev' into dev-cvh

* dev:
  clean warnings and FIX Roxygen
  fixed failing tests on clean build from terminal
  fixed shiny examples
  refactored time preference extraction into a utilities function
  splanInput requires a raw String instead of parsed json/list instance
  fixed trailing ',' causing the leads parsing to fail
  fixed DESCRIPTION and NAMESPACE
  implemented v1.0 of Splan web service returning the solution when POSTING a splanJSON
  refactored jsonFile into SplanJSON
  updated playground dev code
  created Config instance and JSON configuration file to configure the service externally
  exported service start and stop methods
  updated package description to include Rook and httpuv for the splan webservice
  AccentInput now reads preferences and unavailabilities from SplanJSON constraints
  modified simple_json to work with modified patient and therapist preferences/availlabilities

Conflicts:
	pkg/DESCRIPTION
	pkg/R/input.R
	pkg/inst/shiny/accent/global.R