merge test2

merge test2
Commenting on MainActivity finished
Really Commenting finished

in MainActivity
Merge remote-tracking branch 'origin/master' into todo1-graduate-parsing

Conflicts:
0830