resolution for desktop changet to 1280x800
Merge branch 'slave'