refactored controller tests to reflect new design
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
fixed autocomplete search - including correct files
Merge pull request #74 from onweapps/master

fixed autocomplete search - including correct files