added parent activities to enable up button
Merge branch 'master' of https://github.com/CMPUT301F14T09/Team09Project