Resolve #107, #108
Merge branch 'master' of https://github.com/newpointer/rsearch

Conflicts:
	dist/nkb-app/build.properties
	dist/nkb-app/index.html
	dist/nkb-app/main.js