81881590 - fixed issues with activity save and media stuff
81881590 - fixed merge conflicts
moved the final save to the last page
Merge pull request #18 from ActivityRez/81881590

some final cleans to the activity stuff