Changed CategoryQuantities to include generics

We had to change the jsp's as well.
(List<? extends CategoryQuantities<?>> because a List of
CategoryQuantities<Long> is not the same as a List of
CategoryQuantities<String> cf:
http://stackoverflow.com/questions/746089/java-generic-listlist-extends-number)