- updates;
Merge branch 'master' of https://github.com/Loanfish/Loanfish-iOS

Conflicts:
	Loanfish-iOS/Classes/ViewControllers/Main/MainStoryboard.storyboard