good actions list
remove js code from template; redo reservoir show hide in angular
sync reservoir vs timeline part 1
merging upstream