Initial work
Merge remote-tracking branch 'origin/master'

Conflicts:
	eae.info
	eae.install
	eae.module
	plugins/export_ui/eae_mapping.inc