commit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
prove
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/beans.xml
Merge pull request #99 from pisi79/master

rs mixin