DAO changes
Merge branch 'master' of
https://github.com/thilankadileepa/StockScreener

Conflicts:
	StockScreener/.settings/org.eclipse.jdt.core.prefs
	StockScreener/.settings/org.eclipse.wst.common.component
	StockScreener/pom.xml
	StockScreener/src/main/java/org/sixtynine/stock/controller/UserCategoryController.java
	StockScreener/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml