changed to use angular query/get
plurals on api
removed some caching
Merge remote-tracking branch 'origin/master'