Changed name of project
Changed name of project again
Merge branch 'master' into mainactivity