maven compiler
wtf ce bug again !
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/config1.fml