pre merge master
aligning feature to current master record

Merge branch 'master' into AccountControl
Updated styling for fonts, nav bar, and page structure
Added Pivotal Tracket story list for this project to main Admin page.
Merge branch 'master' of github.com:luke-dr/oso
UI tweaks, spec fixes
Added new Alt Flight rendering logic and moved Pivotal Tracker list from Admin::user view to Admin::base view.
User awareness on ux according to regular expressions
Bringing latest account control in line with latest master

Merge branch 'master' of github.com:luke-dr/oso into AccountControl
Latest master integrated
added links from Admin base index to Tracker story
Merge branch 'master' of github.com:luke-dr/oso
Fixed flight number issue on itinerary show page.
Fixed merge issue on index