mache AbstractActivity abstract
Merge branch 'part1' into part2