remove dup
.
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi

Conflicts:
	ranking/src/.DS_Store
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi

Conflicts:
	service/src/main/java/com/shopzilla/service/shoppingcart/resource/ShoppingCartResource.java
fixed isAlpha, remove duplicated urls