Merge branch 'master' of https://github.com/rogotulka/AddressBook

Conflicts:
	app/src/main/java/com/sample/app/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/sample/app/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/sample/app/MainActivity.java
Merge branch 'master' of https://github.com/rogotulka/AddressBook

Conflicts:
	app/src/main/java/com/sample/app/MainActivity.java
	app/src/main/res/layout/activity_main.xml