use angular router only for controller picking + fix controller generator naming
inc version