added some route matching for ux
completed - basic nav, basic signout controller and spec. incomplete - more tests and dependent views
fix merge conflict