Generic DAO implementation
Merge branch 'master' of
https://github.com/clascelles/CEG_4912_cerberus_system.git

Conflicts:
	cerberus-server/src/main/java/com/cerberus/server/persistence/DAO/CurrentDAO.java