Merge remote-tracking branch 'upstream/develop' into develop

"Because I said so."
Remove scaffold and update the navbar css
Merge pull request #55 from Icarurs/develop

Navbar edits