Redefined the project's maven and IntelliJ structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	pcge-core/pcge-core.iml
	pcge-core/pom.xml
	pcge-macros/pcge-macros.iml
	pcge-macros/pom.xml
New Monadic Blueprint Model and Triangles