.
.
.
Merge branch 'dev'

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/pl.chojnackis/administrator-struts/pom.properties

Signed-off-by: chojnackis <chojnackis.sc@gmail.com>