Merge branch 'feature/navupdate' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Feb 2018 18:29:37 +0000 (13:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Feb 2018 18:29:37 +0000 (13:29 -0500)

Trivial merge