added glossary
Merge branch 'master' of github.com:lumifyio/lumify