Merge branch 'ParseBranch' into feature/user-ui-flow

Conflicts:
	Cavemen/DiscoverVC.m
Merge branch 'feature/user-ui-flow' into ParseBranch

Conflicts:
	Cavemen/DiscoverVC.m