setup finish
Merge branch 'master' of https://github.com/MinyeLee/phonebook

Conflicts:
	project.properties