update .gitignore
delete auto-generate line in jjhs.jsp
Merge branch 'dev' of https://github.com/xiaojimao18/atomkios_ddbs into dev
fix user log in bugs