Lubis branch

This brings the lubis demo branch back into master.

This activates the time button for the whole application. Before the next deploy, we need to decide if we want to show this button at all times.