Chg js and view refactor
Merge branches 'dev' and 'master' of https://github.com/KoshkinAlex/fincontrol