update pom
Merge branch 'master' of https://github.com/mcamier/lazyEngine

Conflicts:
	lazyEngine.iml
	pom.xml