Adding filters
Implementing index catalog
Implementing Strategy for queries
Merge origin/develop into develop
Implementing products display and shopping cart
Implementing shopping cart
Resolved conflicts part 1
Resolved conflicts part 2
Implementing Web Service bank
Strating most sold query
Merge origin/develop into develop

Conflicts:
	BooXtore/BooXtore-war/src/java/com/booxtore/managed/NavigationBean.java
	BooXtore/BooXtore-war/web/WEB-INF/faces-config.xml