error fixed in mainacitivity
Merge remote-tracking branch 'origin/master'