Test
Merge branch 'master' of https://github.com/danielhvs/core

Conflicts:
	src/main/java/br/com/danielhabib/core/App.java
	src/main/java/br/com/danielhabib/core/Main2D.java
Resources are now in a standard place, maven default: src/main/resources
TODO: Finish executable jar assembly.