Auto merge of #1394 - Barnoid-:patch-2, r=locks
Auto merge of #1394 - Barnoid-:patch-2, r=locks

Update quick-start.md

- version bump to 2.5
- fix broken link to ember-cli-deploy
- add info on how to deploy to an Apache server
  (there are lots of hits in Google about this and many misleading/nonworking suggestions. The simplest working one seems to be FallbackResource)

knownasilya/guides,jkarsrud/guides,bmac/guides,knownasilya/guides,skaterdav85/guides,jkarsrud/guides,tleskin/guides,skaterdav85/guides,tleskin/guides,HeroicEric/guides,MarkMT/guides,davidpett/guides,skaterdav85/guides,knownasilya/guides,MarkMT/guides,ubuntuvim/guides,tleskin/guides,davidpett/guides,knownasilya/guides,HeroicEric/guides,skaterdav85/guides,MarkMT/guides,jkarsrud/guides,MarkMT/guides,bmac/guides,ubuntuvim/guides,jkarsrud/guides,davidpett/guides,bmac/guides,ubuntuvim/guides,nicobot/guides,nicobot/guides,nicobot/guides,bmac/guides,ubuntuvim/guides,HeroicEric/guides,davidpett/guides