Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  well that was a silly mistake...
  setting wasn't being applied
  rev update
  diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
  diabook: theme-settings: users can set font-size and line-height for posts and comments
  diabook-themes: small fixes
  quattro: language icon in navbar
  move html out of lang_selector() and new template lang_selector.tpl
  display settings: show theme screenshot on page load
  quattro: add admin theme settigs. darker items background with a bottom border.
  admin: change global theme settings
  quattro: work on     "like" activitiy items less visible     fixes to widths     popup notification out of navbar     category input in jot
  validate_url allow naked subdomain if is "localhost"

* master: