Companion Database Done and others

Companion Database is up and running with (I believe) all the functions
we are going to need. You can now set your active companion and if you
select the companion you already have selected again, you will have no
active companions.
Merge branch 'master' of https://github.com/SeanKSpr/Lost_Chronicle

Conflicts:
	Lost_Chronicle/gen/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/R.java
	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/Event.java
	Lost_Chronicle/src/edu/auburn/eng/csse/COMP3710/Group_22/lost_chronicle/Event_Scheduler.java