kalase
Merge branch 'master' of
https://github.com/tsironis13/ThesTourGuideRemoteRepository.git

Conflicts:
	ThesGuideProject/bin/classes/com/example/thesguideproject/MainActivity$1.class
	ThesGuideProject/bin/classes/com/example/thesguideproject/MainActivity$PlaceholderFragment.class