Buttons
Merge remote-tracking branch 'origin/Samir' into canzhiye
Fixed buttons
Merge remote-tracking branch 'origin/master' into canzhiye
samir, add your fucking subviews to self.view