no message
Merge branches 'mint' and 'James' of https://github.com/globalways/app-cli into mint

* 'mint' of https://github.com/globalways/app-cli:

# By JamesFan
# Via JamesFan
* 'James' of https://github.com/globalways/app-cli:
  no message

Conflicts:
	www/index.html
	www/js/app.js
	www/js/controllers.js
	www/js/services.js
	www/templates/tab-gasMap.html
	www/templates/tab-setting.html
	www/templates/tabs.html