playing
adding new library files and adding to app module loader
index change
massive refactoring for upgrade to 1.2
merge ken's design
merge conflict fixes
little code cleanup
recursive category tree directive
more changes for the upgrade
last change, possibly
Merge branch 'master' into upgrade

Conflicts:
	app/index.html
	app/js/controllers/productCtrl.js
	app/js/services/userService.js
	app/partials/cartView.html
	app/partials/category.html
	app/partials/nav.html