updated glossery
Merge branch 'dev' of github.com:metacake/core into dev