Fixed intent switcher, changed it to CustomActivity in case we find more shared functionality.
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project