Merge branch 'master' into design_merge
Design tweaks, prevent double tagging on empty body posts, add touch icon, defer scripts for performance, add lightbox plugin
Begin beuilding custom lightbox, mobile-friendly chooser text,
Fix lightbox
Merge branch 'design_merge'

Conflicts:
	app/static/js/kudos.js