Finished updating poster
Merge branches 'master' and 'dev'