Added download preferences
reordering camoes
resolved merge conflict from development