Merge branch 'origin/develop'
slight clean up
Merge branch 'origin/master'
Log in clean up so User can be used in Nav
Dynamic Nav
Fixed modal error which was causing the form to be out of alignment
Merge pull request #43 from HexagonSystems/feature/Navigation

Feature/navigation - Converted the navigation to dynamically load from the database.
Merge pull request #44 from HexagonSystems/develop

Develop