changes...
fixed conflict
Merge branch 'master' of http://github.com/meet-projects/aidme-y3-2014
added the pressed button