Merge pull request #113 from it-workshop/wp/CAROLINE-38/1

CAROLINE-38: Merge demos to the main application.
(cherry picked from commit a7bd43e7b6a636d8f297661cd0538fc3c5731659)

Conflicts:
	demo/flowdemo/main.cc