| Ayanga & Michael | Refactored controller methods -> service
| Ayanga & Michael | Refactored more controller methods -> service
Refactoring dao to not use service
Refactored more controller methods -> service
[AS] merge conflicts from mlennon3
Merge branch 'mlennon3-master'