Merge branch 'master' of https://github.com/FelipeQuirce/Framework2

Conflicts:
	.idea/workspace.xml