//
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/java/ru/toomake/dll/renaultsokol/MainActivity.java
// modified
// modified