Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge pull request #1 from jarkelen/dev

Dev
added unicorn
Merge branch 'master' into dev
updated categories overview