fixing table view
merge stuff
Merge branch 'master' into Update

Conflicts:
	application/controllers/upload.php
fixed table output
added update nav bar

added update nav bar to the user management page.
add table styling
fixed nav bar home button
added create new user button
added base style to home page
pre user preferences
added custom user pref

The user can now set/customize their own background color.  Beta
functionality.
implemented color theme
Merge branch 'Update'