Merge branch 'master' into openIndyXML
extended stream function
extended datastream
Merge branch 'master' into sensors
start of implementation of watchwindow settings
Merge branch 'task_Jens' into sensors
Merge branch 'master' into openIndyXML
add comment -> same code in OiProjectExchanger and OiProjectRestorer
continue implementing storage of OpenIndy project
added checkbox creation for streamed attributes
change reading type still bugged
continue implementing saving projects #10
restructure project storage calls
Merge branch 'relativePluginPaths' into watchwindow
extend watchwindow
Merge branch 'task_martin' into watchwindow

Conflicts:
	openIndy.pro
start multiselect implementation
Merge branch 'extendDefaultPlugin' into watchwindow

changed order of supported reading types in pseudo tracker class
changed default measurement config, so that polar is selected if possible

extended watchwindow, so now you can chose the streamed reading type
changed scale determination
Merge branch 'watchwindow' of https://github.com/OpenIndy/OpenIndy into watchwindow

Conflicts:
	plugins/OiDefaultPlugin/oiDefaultPlugin.pro
Merge branch 'tmpMaster' into watchwindow

Conflicts:
	plugins/OiDefaultPlugin/oiDefaultPlugin.pro