Updating iml
updating iml
Merge branch 'master' of https://github.com/interactivespaces/interactivespaces

Conflicts:
	interactive-spaces.iml
Fixing .iml file.
Merge branch 'master' of https://github.com/interactivespaces/interactivespaces