update controller
Merge branch 'master' of github.com:sbaechler/mini-power-pc

Conflicts:
	app/scripts/controllers/main.js
bugfix, make add1 work