Merge branch 'master' of K:\Android_Env\AStudio\SJournal with conflicts.
commit second