ui-router changes
Merge branch 'master' of github.com:littlenag/akwire

Conflicts:
	akwire/public/partials/roles/edit.html
	akwire/public/partials/roles/list.html