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

Core pr 3 (merge with Artesis)
Merge branch 'master' into release
Merge branch 'release' of github.com:ding2tal/ding_availability into release
Updated makefile to point to development branch and ding2tal
Resolved merge conflict with release branch