Updated UML to use singletons when starting different activities. Removed methods which are not implementable in json.
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project