Added error conditions, waiting for the message to display
Network error message ready
Merged master on markersTimeout
Merge branch 'markersTimeout'