add new ui
Merge branch 'master' of https://github.com/yliu1019/vocabulary into yliu1019-master
Merge branch 'yliu1019-master'
Merge branch 'master' of https://github.com/thomaszhwang/vocabulary

Conflicts:
	db.php