enabled touch for popup
more ui improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	xlr8/static/xlr8/js/scripts.js