updated routing
fixed spec
Add more EAT specs
Merge branch 'develop' into eat-admin