changed nested resources object to simple resources object
fixed customer login
done for now
more
Merge branch 'master' into js_improvements
Feature #1729
build