fixes to cursor

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Fixed syntax error in usage of anonymous function.
  rev update
  quattro: add id to items container div needed to make commit 4c6a4321 work
  update head.tpl for dispy
  rev update
  use regular theme choosing logic if no mobile theme is specified
  Removed useless function
  disable tos and privacy links
  disable tos and privacy links
  Rplace spaces with undercores in tags
  Introducing Frost Mobile
  Introducing Frost
fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge branch 'master' of github.com:simonlnu/friendica

* 'master' of github.com:simonlnu/friendica:
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
Frost-mobile: media query in css for tablets

Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
Merge pull request #426 from cvogeley/master

Frost-mobile: Add media query in stylesheet for tablets
rev update
Merge https://github.com/friendica/friendica into pull
allow themes to change the size of embedded videos
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
add a 'manage' icon to clarify things

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #428 from simonlnu/master

new 'manage' icon
Merge pull request #427 from fermionic/frost-embedded-videos

allow themes to change the size of embedded videos
rev update + don't tag anything in [] brackets
Merge https://github.com/friendica/friendica into pull
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items