v1.0.0 20141212 yjBae
Merge remote-tracking branch 'origin/master'

Conflicts:
	hopeHoff/.classpath
	hopeHoff/.gradle/2.1/taskArtifacts/cache.properties.lock
	hopeHoff/.gradle/2.1/taskArtifacts/fileHashes.bin
	hopeHoff/.gradle/2.1/taskArtifacts/fileSnapshots.bin
	hopeHoff/.gradle/2.1/taskArtifacts/outputFileStates.bin
	hopeHoff/.gradle/2.1/taskArtifacts/taskArtifacts.bin
	hopeHoff/.project
	hopeHoff/.settings/org.eclipse.jdt.core.prefs