request changes
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE
fix name of level + time/timescale
chart requests with join
json fixes, chart configs, other fixes
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE
fix in json
package change, fix filter
+ measure, reading chart request (not finished)
fixed names, optical indication for missing options
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE
~ measure getAggregations
measures with aggregations
javadoc
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

Conflicts:
	app/what/sp_chart_creation/Measure.java
fix filter/axis
chart requests fucking work (i think ...) :D
repo repair