Copied all files from dev branch