Bug 895726 - [Buri][Monitor][MMS] Unable to save attachement from Camera(with conflicts fixing)

Fix conflicts in:
 - apps/sms/index.html
 - apps/sms/js/startup.js