push
resolver sucks
mixin doesnt work
Merge remote-tracking branch 'upstream/master'

Conflicts:
	base-rs/src/main/java/org/giavacms/base/rest/RsMixinConfigurator.java
	base-rs/src/main/resources/META-INF/web-fragment.xml
	catalogue-rs/src/main/java/org/giavacms/catalogue/service/rs/ProductRs.java
static contents
pullable
Merge pull request #100 from pisi79/master

static stuff