powrót do ngroute
Merge branch 'master' of https://github.com/tomaszszczerba/choose

Conflicts:
	Choose/app/index.html
	Choose/app/scripts/app.js
	Choose/bower.json
KOMIT SROMIT
xxx
Merge branch 'master' of https://github.com/tomaszszczerba/choose

Conflicts:
	Choose/app/index.html