Enabled optimization in configuration file for make
Disabled plugins (can be reactivated by Ctrl+Shift+V)
Merge branch 'configurationchanges' into featuremerge

Conflicts:
	surf.c