last
AddedProductPerDay
last
last
last
Merge branch 'master' of github.com:ChelFeb/CaloriesCulc

Conflicts:
	src/main/webapp/WEB-INF/pages/secured/user/main.jsp
Merge branch 'master' of github.com:ChelFeb/CaloriesCulc

Conflicts:
	src/main/webapp/WEB-INF/pages/secured/user/main.jsp
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products
fix jquery conflicts, added table of adding new products