2014 12 16 v 1.0.0
지용근 details 작업중
Merge remote-tracking branch 'origin/master'

Conflicts:
	hopeHoff/src/main/webapp/web/details/details.html