starting new branch
testing timeout in angular to get maplist working
struggling with conflict
maplist working using g'al plain js and timeout
more work on maps
Merge branch 'master' of github.com:gfpk/aria