ui-router
image uploading
Merge branch 'use-ui-router' into rewrite