Updated reference to long description placeholder branch in default-theme
Updated default-theme
Update default-theme: size of text area fits placeholder
Merge branch 'master' into issue-685-long-descr-placeholder

* master:
  ckan_api form fix
  Include libjepg-dev for uploader
  Fix
  Show avatars
  Use styles
  Render thumbnail not link
  Use the real app
  Fix typo
  Use default theme fixes
  Use the master branch
  Rename new_profile to profile
  Fix broken endpoint for profile
  Update tests for new endpoint
  Fix new endpoint for users
  Use new default theme
  Use the new fixes in the theme
  Merge public and private profiles in one endpoint

Conflicts:
	pybossa/themes/default
Updated default theme ref
Merge branch 'master' into issue-685-long-descr-placeholder

* master: (44 commits)
  Add default timeout to 300
  Fix import path
  Skip apps that have been already analyzed.
  Check for a local configuration, otherwise use default
  Add a default configuration for cache
  Disable cache, so we can upsert the values
  Compute key first
  Store the values in Redis eventhough is disabled
  update cache with statistics
  Include app.id
  Small fix, passing upload method to user contributed tasks too
  use new default theme
  Revert "use new default them"
  use new default them
  Updated submodule default-theme ref after merging to master
  Updated subdomule default-theme:Fixed issue with app creator in applications/index.html
  Get user.info in get_top, Use new avatars instead of gravatars for top users in /home
  Get user.info in get_users_page too, Use new avatars instead of gravatars for users in /account -- community
  Update submodule: fix for app avatars in public profile
  Update default-theme submodule after merging to master
  ...
Merge pull request #769 from PyBossa/issue-685-long-descr-placeholder

Issue 685 long descr placeholder