words view updates
Merge branch 'master' of https://github.com/mpsk/BookReader
2 fixs
Merge branch 'master' of https://github.com/mpsk/BookReader

Conflicts:
	app/service/user.js
words list