completes ui-router, adds ui-sref-active, re-implements controllers for use with ui-router