change placheholder
fix heighlight to highlight
fixed favicon
fixed css style for adminreport
fixed
fixed confilt
fixed
Merge branch 'master' into production
add app min js