Added another category called help
Merge pull request #11 from sharoonthomas/develop

Add .travis file
Added search result page and fixed helper
to display product in category page
Merge pull request #18 from rahulsukla/develop

Added search result page and fixed helper to display product in category page
Added pagination macros in helpers template
Merge pull request #19 from rahulsukla/develop

Added pagination macros in helpers template
Fixed the search result page
Merge pull request #20 from rahulsukla/develop

Fixed the search result page
Merge pull request #10 from rituparnapanda/develop

Added another category called help
added html5shiv and respond.min.js
Merge pull request #21 from rahulsukla/develop

Fixed html5shiv and respond.min.js
Fixed the view of search result page

* Fixed the broken view of search result page.
Merge pull request #22 from rahulsukla/develop

Fixed the view of search result page
Added nereid_catalog_tree as dependency #3459
Merge pull request #23 from prakashpp/develop

Added nereid_catalog_tree as dependency #3459
Fixed blocks of logo, search and user account

* Fixed the blocks so that if suppose we put blank search block it should not make empty search space.
* Fixed the static url in address-edit template.
Added a new block new_offers n home page #3498

* added new offers area optional using block statement
* added help article category.
* Fixed the link of my cart.
Merge pull request #24 from rahulsukla/develop

Fixed blocks of logo, search and user account
Use data_files instead of package_data for templates
Revert "Use data_files instead of package_data for templates"

This reverts commit 8ab4d723e5d9d9f19043bbe7b22bd4f4b797b6c9.