Merge branch 'Update'11

Conflicts:
StartActivity.java