Merge dev to master (Add blog layout to master)

Merge dev to master (Add blog layout to master)