#7: Added support for ngResource, updated controllers