GNR-16 cleanup
GNR-16 bugfix
GNR-16 changed lodash-amd to normal lodash
GNR-16 bugfix