<NME> index.js
<BEF> import apiProvider from './api.provider';

export default angular
    .module('ng-rest-api', [])
    .provider('api', apiProvider);

<MSG> Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bower.json
#	ng-rest-api.min.js
#	package.json
#	src/api.provider.js
#	src/api_endpoint.js
#	src/api_endpoint_config.js

<DFF> @@ -1,5 +1,5 @@
 import apiProvider from './api.provider';
 
 export default angular
-    .module('ng-rest-api', [])
+    .module('ng-rest-api', ['ngResource'])
     .provider('api', apiProvider);
\ No newline at end of file

Merge remote-tracking branch 'origin/master'