Merge pull request #1 from rmelanson0451/master

my first pull request, tweaking karma config
cleaned up cache and $api. there were bugs.
Merge remote-tracking branch 'origin/master'
making category pull work reload with log in...for now.
working on order search
Merge remote-tracking branch 'origin/master'
making product work with log in...for now.
order search complete
Merge remote-tracking branch 'origin/master'
changed to use angular query/get
plurals on api
removed some caching
Merge remote-tracking branch 'origin/master'
adding some new resources
images
trying to get a basic unit test to work, period.  no luck yet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/karma.conf.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/karma.conf.js