Removing the .idea folder
Merge branch 'master' of https://github.com/teknorob/smms

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
Clint change