fixing bower.json
Merge branch 'unstable' of github.com:ciddan/bower-angular-resource into unstable

Conflicts:
	bower.json