Removed unnecessary pragma for angular
Merge branch 'refactor2' of https://github.com/volusion-angular-themes/method into refactor2

Resolved conflicts:
	app/scripts/app.js
	app/scripts/controllers/category.js
	app/scripts/controllers/home.js
	app/scripts/controllers/page.js
	app/scripts/controllers/product.js
	app/scripts/directives/easy-zoom.js
	app/scripts/directives/legacy-link.js
	app/scripts/filters/html.js
	app/scripts/filters/legacy-linkify.js
	app/scripts/filters/seo-friendly.js
	app/scripts/services/app-config.js
	app/scripts/services/cart.js
	app/scripts/services/site-config.js
	app/scripts/services/theme-settings.js
	app/scripts/services/token-generator.js