6/25 SAVED DATA LOADING
6/25 saved data loading
Merge branch 'master' of https://github.com/JeremyJeong/TouchMind.MP1.Media.Ajou

Conflicts:

TouchMind.MP1.Media.Ajou/TMViewController/TMMapViewController/TMMapViewC
ontroller.m

TouchMind.MP1.Media.Ajou/TMViewController/TMNavigationViewController/TMN
avigationViewController.m
asdsafdsfdsfsdf