Increasing stream timeout to 5 seconds
Importing timeline app; moving map app into own directory
Unifying map and timeline apps