Fixed jade layout
fixed layout.jade conflict
implemented Add user functionality
Merge branch 'develop' of github.com:tribuwayuk/gzais into develop