add aida working
Merge branch 'master' into mergedata

Conflicts:
	.gitignore