Added MAC address for static ip assignments
Merge branch 'hotfix/mac_address_correction'