Merge remote-tracking branch 'upstream/master' into Issue-5_Freeze-property

Conflicts:
TLYShyNavBar/TLYShyNavBarManager.m