Add a for user settings
Fix the link that the cog leads to
Merge pull request #68 from Icarurs/develop

Add a cog to the navbar
Merge remote-tracking branch 'upstream/develop' into develop

chicken