New/old branch
Commit before Pulling Parent
Merge remote-tracking branch 'origin/dev' into NikitaSmall
Merge remote-tracking branch 'parent/dev' into NikitaSmall
Merge remote-tracking branch 'origin/NikitaSmall' into dev

Conflicts resolved:
	AndroidManifest.xml