배연정 20141212 v1.0.0
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/taskArtifacts.bin
	hopeHoff/.settings/org.eclipse.jdt.core.prefs
	hopeHoff/.settings/org.eclipse.wst.common.component
	hopeHoff/src/main/webapp/web/main/main.html