Re-adding ashley theme step 1.
Update navbar classes round 1 - ashley theme.
Merge branch 'master' into ashley-theme

Sync up with the master branch.
Rob wants to test this out
Conflicitng change.
Merge remote-tracking branch 'origin/ashley-theme' into ashley-theme

Conflicts:
	src/main/webapp/css/main.css

Resolving conflict.
Another test
Merge remote-tracking branch 'origin/ashley-theme' into ashley-theme

Conflicts:
	src/main/webapp/css/main.css

I know what I'm doing, I rock!
Update main.css
Update main.css
Merge branch 'master' into ashley-theme

Sync w/ master branch.
Make selected navbar menu active.
New logo and nav bar adjustments for different media queries.
bug: minor typo in 'create event' navbar
Merge branch 'master' into ashley-theme

Sync w/ master.
Position progress icon + adjust iphone menu item height and font
Login button cleanup + banner cleanup
Minor nits.
Merge branch 'master' into ashley-theme

Sync w/ master.
Adjust typography and panels.