Changed home page order, changed navigation item names
Changed the create new asset button text and positioning
Added forms and mixins files. Also updated the shared stylesheet to alwayws bring in form styling
Changed the add button for create new asset to create new and changed the class it uses
Updated table styling to get a base structure and fixed an html issue repeating tbodys for each row with the asset logs
Making commit on latest update
Fixed bug with home page
Added min width of 445px to .row
Made changes to the asset page with log listing
Made changes to the edit asset page
Updated the text on the home page and the asset information page
Small changes to the asset history
Merge branch 'styling'

Conflicts:
	app/views/assets/index.html.erb
	app/views/shared/_navigation-app.html.erb
Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	app/views/assets/show.html.erb