merge with develop
Added files from hugh
Added all assets seperate
Merge with patryk into develop