Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Bug 1019816 - Logshake

Add a developer option to store logcat to sdcard by shaking the phone.
Bug 1048772 - Incorrect value in "app.update.battery-threshold.plugged" and "app.update.battery-threshold.unplugged" are allowed
Bug 1030431 - correctly handling dialog overlay visibility in the dialer and callscreen apps.
Bug 1016816 - [CostControl] Update to use gaia-header
Bug 1048373 - [settings] can't join hidden network, have to join it ...
Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Bug 1043347 - [Dialer][Call Screen] Bad alignment of information in conference call overlay
Bug 1011016; new marketplace dev/stage packages
Bug 1041902 - Add theme color for cost control
Bug 1041903 - Fix theme color for dialer
Bug 1000049 - APP=callscreen make install-gaia should restart b2g to pick up the changes
Bug 1045919 - JavaScript Error: "TypeError: AppWindowManager.getActiveApp(...) is null" {file: "app://system.gaiamobile.org/js/activity_window_manager.js"
Bug 1043275 - Follow-up, fix test to retry scroll before verifying meta tag R=me
Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring
Bug 1050097 - [Camera] Add error handling while |videoStorage.addNamed| occurs error.
Bug 1035117 - [Keyboard] To support password input
Bug 1015309 - Update the default and English symbol panel.
 - Update the layout definition and the alternateLayout part to align with the default symbol panel 1.
 - Don't add special chars at symbol panels for type=email, url.
 - Remove hidden/visible property for symbol panel.
Bug 1051758 - Lockscreen Visual Refresh: "More Notifications" hairline is misaligned
Bug 1049279 - [Keyboard][ja] Recover Japanese ime dictionary for jp-kanji

Update README and Makefile to apply naist-jdic

fix the raw dict file (dict.utf8) with conv.py instead of a diff patch