Added the OK button
Added the cancel button
Added ok and cancel buttons to the main activity
psd file
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop