pom
Merge branch 'master' of https://github.com/icaruswfb/min

Conflicts:
	min/target/m2e-wtp/web-resources/META-INF/maven/br.com.min/min/pom.properties