removed uneeded backup
Merge origin/master into dev