Finished specific emitters, tackling affectors
Merge branch 'master' of github.com:nnesic/FabulousParticleCreator

Conflicts:
	CEGUIStuff/layouts/ControlPanel.layout
	GeneralProperties.cpp