Merge pull request #10 from raskasa/kasa-dev

Kasa dev
Single and bulk user creation
Merge remote-tracking branch 'origin/kopra-dev' into evan-dev

Conflicts:
	GreenhouseGraphing/WebContent/pages/adminPrivileges.jsp
	GreenhouseGraphing/src/dao/MangoDAO.java
Merge remote-tracking branch 'origin/kopra-dev' into evan-dev

had to comment out some category things that were causing errors, but tied users page to admin privileges
Merge remote-tracking branch 'origin/evan-dev' into crmaykish

Conflicts:
	GreenhouseGraphing/WebContent/pages/adminPrivileges.jsp
	GreenhouseGraphing/WebContent/pages/users.jsp
	GreenhouseGraphing/src/dao/MangoDAO.java