Bug 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive
Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan
Merge pull request #24660 from tauzen/Bug1074800_listen_on_nfc_enabled

Bug 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive
Merge pull request #24741 from RickyChien/bug-1053703

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan