Pushing db handler changes (still work in progress)
Added in new classes
Switched to a new Team object
Merge branch 'DBHandler'
Updated DatabaseHandler
Updated db handler
Merge branch 'master' of heroku.com:elec3609-friendzone
changing availability works
Merge branch 'master' of heroku.com:elec3609-friendzone

Conflicts:
	src/main/java/friendzone/elec3609/controller/AvailabilityController.java
merged - marjs stuff with callums stuff
merged with conflicts etc....