2013.10.21.10.44

First Commit Joshua
Merge remote-tracking branch 'origin/Joshua'
Merge remote-tracking branch 'origin/Ray'
Merge remote-tracking branch 'origin/master' into Ray