Conflicts:
	www/js/app/composites/index-composite.js
	www/js/app/views/dialog/login-view.js