Merge branch 'master' of github.com:nachovz/ideaapp

Conflicts:
	.idea/workspace.xml