expression refactoring (some tests are failing)
fixed test
Merge branch 'master' of github.com:gxa/atlas into expression
removed unused code