Merge branch 'master' of /Users/patmonsi/Documents/AndroidStudioProjects/TourIstanbul with conflicts.
Merge remote-tracking branch 'origin/master'
Solved some issues