fix test
Merge branch 'master' into reload
new loading passes, behave tests need fixing
Import broken file icon from http://upload.wikimedia.org/wikipedia/commons/thumb/7/77/Crystal_Clear_filesystem_file_broken.png/120px-Crystal_Clear_filesystem_file_broken.png
do correct thing for missing docs, fix behave tests
merge master
generic views/models added
added bad generic views, with behave tests
merge in cornice views, ui tweaks
fix tests merge in loading of all data
removed some cruft, only one user table now
biosamples page wip