bae v1.0.0 141218 detail손보는중ㅋㅋ
Merge remote-tracking branch 'origin/master'

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