Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge branch 'development' into release
Merge pull request #8 from ding2tal/core-pr-3

Core pr 3 (merge with Artesis)
Resolved merge conflict with core
Updated makefile to point to development branch and ding2tal
Merge branch 'release' into development