removing gkey
solving conflict

Conflicts:
	core/fleurdelas__define.pro