Edge05/branch02
Created by: edge05
Merging in all the changes to date. Project is almost working completely and added # SPDX-License-Identifier: Apache-2.0 to all the files
Created by: edge05
Merging in all the changes to date. Project is almost working completely and added # SPDX-License-Identifier: Apache-2.0 to all the files