slhale 432ec519b6 Merge branch 'search' into open70 ...

Conflicts:
	platform/commonUI/browse/res/templates/browse.html

2015-08-19 10:05:38 -07:00

..

templates

Merge branch 'search' into open70

2015-08-19 10:05:38 -07:00