Script loading is conditional
Merge branch 'loadingWithCache'

Conflicts:
	www/js/index.js
Angular UI router integration