Merge branch 'master' of https://github.com/przemyslawpalacz/angular-restmod into przemyslawpalacz-master

Conflicts:
	test/collection-api-spec.js

Author: iobaixas