Update bower.json
Update
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls
Fixed controller, services...
Merge pull request #19 from as11712/master

Fixed controllers, services,...
Merge branch 'master' of https://github.com/IPIRI-RSSH/Skrolls

Conflicts:
	app/scripts/controllers.js
	app/scripts/services.js