???
Merge remote-tracking branch 'MozTW/master'
Merge remote-tracking branch 'twqa/master'
update README.md for change_OTA_URL.sh
fix local conflict
 fix local conflict 2
Merge pull request #12 from altsai/master

update README.md for change_OTA_URL.sh