Comitting latest changes to the demo app , it now accomodates live and test environment