integration with aquarium: Progress III & merge master
Refs: #1824
Repo refactor and webproject hooks fixes