code refactor
Merge remote-tracking branch 'origin/master' into team_1

Conflicts:
	app/src/main/java/com/dybas/firstintellijapp/app/MainActivity.java