output html
implemented click logging
Merge branch 'feature-clicklogging' into develop