ui fixes
Merge branch 'master' of https://github.com/andreio/Markets

Conflicts:
	Markets.xcodeproj/project.pbxproj