Added notification when Internet connection is lost
Resolved merge conflicts