Merge branch 'master' of github.com:Shpota/Console
Merge branch 'master' of github.com:Shpota/Console

Conflicts:
	console-ejb/target/classes/META-INF/maven/console/console-ejb/pom.properties
	console-web/target/m2e-wtp/web-resources/META-INF/maven/console/console-web/pom.properties