Remove workspace.xml from .idea directory.
Merge branch 'master' into module-refactoring

Conflicts:
	.gitignore
	.idea/workspace.xml