corrected error handling
updated javascript mock templates
added mock for extra-info-popup
Merge branch 'master' of github.com:gxa/atlas