fixed framework reference paths, fixed typo
changed color of correct location marker
Merge remote-tracking branch 'origin/master'