Merge remote-tracking branch 'joshua/master'
Merge remote-tracking branch 'joshua/master'
Merge remote-tracking branch 'George/master'
Fixed merge error

Fixed merge error
Merge remote-tracking branch 'George/master'
Added loaction.js