Fixed AboutActivity.java and changed quitting of current activity when entering new one
Committing after merge
merge fixes
Merge branch 'ashleyjihye2-master1'