Database --version1
Merge remote-tracking branch 'origin' into develop/dh

Conflicts:
	project.properties
	src/kr/nexters/oneday/MainActivity.java
merge before