Add UserDataController and make DataController more generic
Add Unique Android ID to UserModel
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Working CC without location services...
Merge branch 'bradley'
Merge branch 'master' into steven