apply js
merge; apply js changes; apply html changes and styles
Merge branch 'master' of github.com:vcrazy/project-7
apply js fixes