completed :)
Merge branch 'master' of https://github.com/kodmax/requirejs-seed.git

Conflicts:
	app/scripts/modules/shopping-cart/shopping-list.js