commit
Merge branch 'master' of https://github.com/gaoyuankidult/Keyword-APP
commit
Merge branch 'master' of https://github.com/gaoyuankidult/Keyword-APP

Conflicts:
	src/static/js/keyword_app.js
fixed first js