Merge guides with play 2.3
Fix asset references