bug fix in production
added new feature in index.html
resolved merge conflict
Last release 2 changes added