Uploade SW-Architecture
Merge origin/master