Merge branch 'master' into dev
Added post, logo and documentation
Merge branch 'dev' into fellmeister