rearranging of xml
Merge branch 'Dev' into constants
changed constants and set thread to update every second