Bug fixes for search view
Small tweaks
Merge branch 'master' into fnish_side_profile

Conflicts:
	StyleSnaps/SnapManager+Parser.m
Merge branch 'fnish_side_profile' of https://github.com/adamdahan/StyleSnaps2 into fnish_side_profile