Fb/qi4j 2.0 stable

Merging latest Qi4j stuff to our branch..