Cleaning files
Merge branch 'master' of https://github.com/Mannaio/Invoice_generator
Application js conflict fixed