Highstock v1
Merge branch 'master' of github.com:NBlackout/StockPortfolioManager-web

Conflicts:
	WebContent/stockHistories.jsp
	src/com/stockportfoliomanager/servlet/SocietyServlet.java