UpdateAids
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/oles/rus/app/olesrusapp/MyActivity.java