Initial upload
Merge branch 'master' of https://github.com/elonmulder/ForGood

* 'master' of https://github.com/elonmulder/ForGood:
  Uodate 07/07
  Updates
  Initial upload

Conflicts:
	www/config.codekit
	www/data/css/default/main.css
	www/data/css/default/main.less
	www/data/fonts/icons/forgood.eot
	www/data/fonts/icons/forgood.svg
	www/data/fonts/icons/forgood.ttf
	www/data/fonts/icons/forgood.woff
	www/index.html
	www/js/app.js
	www/js/app.min.js
	www/js/controllers.js
	www/js/controllers.min.js
	www/js/services.js
	www/js/services.min.js
	www/lib/ionic/css/ionic.css
	www/lib/ionic/css/ionic.less
	www/lib/ionic/js/angular/angular-animate.js
	www/lib/ionic/js/angular/angular-animate.min.js
	www/lib/ionic/js/angular/angular-resource.js
	www/lib/ionic/js/angular/angular-resource.min.js
	www/lib/ionic/js/angular/angular-sanitize.js
	www/lib/ionic/js/angular/angular-sanitize.min.js
	www/lib/ionic/js/angular/angular.js
	www/lib/ionic/js/angular/angular.min.js
	www/lib/ionic/js/ionic-angular.js
	www/lib/ionic/js/ionic-angular.min.js
	www/lib/ionic/js/ionic.bundle.js
	www/lib/ionic/js/ionic.bundle.min.js
	www/lib/ionic/js/ionic.js
	www/lib/ionic/js/ionic.min.js
	www/lib/plugins/chart.min.js
	www/templates/account-create.html
	www/templates/account-energy.html
	www/templates/account-mobility.html
	www/templates/account-monitor.html
	www/templates/forgot-password.html
	www/templates/login.html
	www/templates/product.html
	www/templates/progress.html
	www/templates/update.html