k
Comment
Added admin config
Db Nullpointer FIx?
Merge branch 'experimental' of https://github.com/MercuryGroup/Project into experimental
Updates
Merge branch 'experimental' of https://github.com/MercuryGroup/Project into experimental
Couple of changes to DB connection in owners

To avoid excessive number of connections
Merge branch 'experimental'

Conflicts:
	bin/DBConnector.class