added Kamil's commits, rearranged files, minor fixes v2
erge commit 'ddb0c201442055276c84850e608f95f25fb868b3' into ios reverts commit ddb0c201442055276c84850e608f95f25fb868b3.

Conflicts:
	MyGuide.xcodeproj/project.pbxproj

Conflicts:
	MyGuide.xcodeproj/project.pbxproj