Development

Merge development with master. Major code changes mostly related to ubuntu 14.04, private github repo checkout and support for automatic update of drupal core + modules.