Init Project
Merge branch 'master' of https://github.com/nunoit/nunoit-core

Conflicts:
	.classpath