Merge pull request #14 from caleb-chan/trial_merge_branch

Merge Sam's branch
Merge pull request #15 from caleb-chan/trial_merge_branch

- Added new test classes for new classes added
- Finish added test cases for adminDaoImpl
- Added annotations for transactions and for rolling back changes
- Fixed missing include
Merge pull request #16 from caleb-chan/master

Update trial branch