Merge branch 'develop'
Sync with Genesis
Bump to beta2
Update screenshot for retina display.
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop