added fountain control
Merge branch 'master' of https://github.com/arktic/Particule

Conflicts:
	Core/src/app.cpp
	Core/ui_mainwindow.h