rename activitys and layouts | fix ID
Merge branch 'andiPatch'