first tinkerings
Merge branch 'master' into brian
better disable
added tooltip
Merge branch 'brian' of https://github.com/sharewave/frontus into brian
tooltip now working