.
Merge branch 'master' of https://github.com/yungyikim/sample

Conflicts:
	src/sample/index/source.h
	win/Sample_VC100/Sample_VC100.suo
.