Merge branch 'ajturner'

* ajturner:
  Advertising Filter changes, Code cleanup. - Advertising filter now pokes a list of cross sale itemBeans that JSPX can parse to display on product pages - Test cart data removed since Add-to-Cart works now, and we should be testing against normal usage from here on out
  Advertising Filter changes 	- Filter now passes a list of advertised items when the user visits product pages 	- init() method parses the mappings loaded from a text file; the file format supports for multiple advertised items given a cart item ID
b2b
jgbvfc
ghj
Updates Views, formula for listener

Changes:
+ Styled Cart
+ Integrated Login as part of Front.jspx

To-do:
+ Analytics Servlet
Merge remote-tracking branch 'origin/master' into justin-11-19-14-8-01
Merged + Style fix
Merged w/ Justin
Integrated Cross-Sales into jspx, added custom tag for random image
generation based on category

Added:
+ Styled Cross-Sales
+ Added imgs per category

To-do:
+ Analytics
Merge remote-tracking branch 'origin/justin-11-19-14-8-01'
Added Express.jspx and Item.jspx which will serve as a landing page for
Express checkout and Item view respectively.

To-do:
+ Modify Front servlet to facilitate this
Added Analytics

Can be accessedd via:
localhost:xxxx/eFoods/e/Analytics
Merged w/ Branch: Justin

Added: Analytics

Left to do:
- Express page
- Categories page
Merge branch 'master' of https://github.com/Sunspar/eecs4413c.git
iuhygt
hgtfr
Merge branch 'master' into ajturner

* master:
  hgtfr
  iuhygt
  Merged w/ Branch: Justin
  Added Analytics
  Added Express.jspx and Item.jspx which will serve as a landing page for Express checkout and Item view respectively.
  Integrated Cross-Sales into jspx, added custom tag for random image generation based on category
  Merged w/ Justin
  Merged + Style fix
  Updates Views, formula for listener
  ghj
  jgbvfc
  b2b