fixed bug
finish modify brand and company  decisions
add
Merge branch 'master' into production
add app min js