company
Merge branch 'master' of
https://github.com/thilankadileepa/StockScreener.git

Conflicts:
	StockScreener/src/main/java/org/sixtynine/stock/controller/CompanyController.java
	StockScreener/src/main/webapp/WEB-INF/pages/company/add.jsp
	StockScreener/src/main/webapp/WEB-INF/pages/company/edit.jsp