Bigger update.
Merge branch 'master' of https://github.com/ciplogic/QuickFx

Conflicts:
	.gitignore
	Packages/QuickApp/nbproject/private/private.properties
	Packages/QuickApp/src/quickfx/QuickFx.java
	Packages/quick_fx/nbproject/private/private.properties