Commented out all debug messages
Remove .idea files
Modified .gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore