Added nav-icons and additional CSS
Merge Prep
Merge branch 'Tier3-Icons'

Conflicts:
	db/development.sqlite3