some updates
Merge branch 'master' of github.com:GeoKnow/Jassa-UI-Angular