Bug 826289 - Make default bookmarks customisable. Since git can't have empty folder, change default_data to be js/ for now. a=bustage
Merge pull request #7304 from vingtetun/bustage-fix5

Bug 826289 - Make default bookmarks customisable. Add the folder by defa...
Bug 826293 Pick Contact Activity is broken if the Contact has more than one Phone Number
Merge pull request #7294 from jmcanterafonseca/fix_phones_4

Bug 826293 Pick Contact Activity is broken if the Contact has more than ...