Merged, please test!
hj
Merge branch 'master' of https://github.com/Sunspar/eecs4413c
- Fixed inconsistencies in Servlet class naming and usage in ServletContext#getNamedDispatcher(...) calls
- Use properties value for main model rather than a magic String
login stuff
gfd
Filter introduced for cross-sale functionality.
- Items can be added and removed through cross-sales.values, only
requiring a server restart to update server mappings (rather than having
to recompile a filter class)
login stuff
Merge branch 'master' of https://github.com/Sunspar/eecs4413c
check username format
GFd
display name
login
login
login
Merge remote-tracking branch 'origin/master' into justin-11-19-14-8-01

Conflicts:
	src/ctrl/FrontServlet.java