Merge pull request #1 from elliotec/development

First Merge from Development to Master
Merge branch 'master' of github.com:elliotec/codeunion into development
added category to way model and category dropdown in way view
Merge branch 'development' of github.com:elliotec/codeunion into development