change the xml as like to xpdo
remove .idea files
remove idea
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	migration.php
	schema/migration.xml