fix up timesheets
Merge remote-tracking branch 'upstream/master'
	modified:   app/assets/images/favicon.ico
	modified:   app/views/layouts/_nav.html.erb
add autocompletes
fix products
Merge remote-tracking branch 'upstream/master'
adjust products