Added some composition relations, added Favorites Controller and Activity
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
added Cache classes
Added basic state diagram
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project