Bug 1045245 - Remove text icon from settings ImageButton
Bug 1045648 - Sometimes header is not removed from results page
Merge pull request #35 from ericedens/settings

Bug 1045245 - Remove text icon from settings ImageButton
Merge pull request #36 from ericedens/webview_header

Bug 1045648 - Sometimes header is not removed from results page
Bug 1045819 - Specify gravity on fragments for margin to take effect on gingerbread. r=eedens
Bug 1042189 - Animation for selecting a suggestion/history item. r=eedens
Merge pull request #32 from leibovic/animations

Merging bug 1042189 and bug 1045819.
Add branding to grunt
Add gecko resources
Add resources
Make this build
Add nightly preview image
Don't push icon back into Fennec
Remove branding changes. I landed those in central themselves.
Update app constants and class name
Merge branch 'widget2' of https://github.com/wesj/FirefoxSearch into widget2

Conflicts:
	app/src/main/res/values/search_dimens.xml
	strings/search_strings.dtd
	strings/search_strings.xml.in