Initial work on individual post page
Merge branches 'dev' and 'master'