closes #50
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
Merge remote-tracking branch '52n/master'
format code block
fix resolving from prematureendofdocumenterror, adding timeout
Merge remote-tracking branch '52n/master' into bugfix/fix_continous-streaming

Conflicts:
	core/util/ilwisconfiguration.cpp
Merge branch 'bugfix/fix_continous-streaming'
Merge pull request #59 from ridoo/master

Resolves the xml stream parsing error