working on connection issue
Merge branch 'connections-error'
closing all result sets
execute multiple sql in batch
Adding an attempted fix to Databse Connector.
fake out heroku
Updating for non web stuff.
iml
Prepare to run as non-web dyne
update app assembler plugin
Jackson manual import

May roll back if it doesn't work
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/Main.java
	src/main/java/Main/BL/FacilityUseService.java
	src/main/java/Main/BL/IFacilityUseService.java
	src/main/java/Main/DAL/FacilityDAO.java
	src/main/java/Main/DAL/IUsageDAO.java
	src/main/java/Main/DAL/MaintenanceRequestDAO.java
	src/main/java/Main/DAL/UnitDAO.java
	src/main/java/Main/DAL/UsageDAO.java
	src/main/java/Main/DAL/UserDAO.java
Naming conventions...