Merge pull request #1 from pikeszfish/dev

Dev merge 12.5
Merge branch 'master' of github.com:pikeszfish/pike_blog into dev