all changes for the new 3.1EAP
Revert "all changes for the new 3.1EAP"

This reverts commit a8525e78c97861720cda4af92c21d027a1b7b009.
Merge branch 'master' of github.com:mbeddr/mbeddr.core