Remove .idea folder from repo
Merge remote-tracking branch 'origin/rodyllBr' into rodyllBr

Conflicts:
	.idea/workspace.xml