Merge branch 'getting_started' of https://github.com/cividesk/civicrm-core into civid...