Create Assets folder
Merge development and master