Merge

Includes Updates for 
 * RESTful interface (refined API)
 * add multiple timeseries requests via POST
 * allow clients to add rendering options (e.g. colors)
 * refactored a bit
 * JSP sites are refined and use bootstrap/leaflet in a first draft