Merge pull request #23 from inodb/fix_issue_5

Add ContentType listing in Admin. Update documentation. Fixes #5
Remove container column from sample_example csv
Merge pull request #24 from inodb/rm_container_column

Remove container column from sample_example csv
Add Sample UID search and filter on collaborators
Merge pull request #25 from inodb/add_sample_search_filter

Add Sample UID search and filter on collaborators
Merge remote-tracking branch 'bills/master' into fix_issue_3_add_modify_units
Merging this branch bills master branch with my local issue branch
Modify the last concentration and Salinity units