added icons, updated browser / intital
Added browser suggetions / branding /initial
merge attempt 1
changed homescreens, changed icons, browser2 appeared
changed browser2 icons to default ones
Merge remote-tracking branch 'origin/master' into new_branch2
temporary commit, testing latest merge
Merge remote-tracking branch 'origin/master' into new_branch2
Merge remote-tracking branch 'origin/master' into new_branch2
Merged titlebar styles from master
Merge remote-tracking branch 'origin/master' into new_branch2
changed the default browser back to ours (with DDG, also added https for Google)
Merge remote-tracking branch 'origin/master' into new_branch2
Merge remote-tracking branch 'origin/master' into new_branch2

Merged updates
Bug 972210 - (Part I) Stop exposing inputContext to IMEs
added new wallpapers, removed some stock ones, changed default gps settings
Merge remote-tracking branch 'origin/master' into new_branch2

Merged.
Bug 1033549: [CostControl] Add a per-app data usage list. r=salva
Merged their branch, changes to chrome from theirs
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into new_branch2