Removed thick_list.hpp.
Merge branch 'next' into sam_thicklist
Merge branch 'sam_thicklist' into next