Merge branches 'master' and 'master' of https://github.com/e-learning/android-30-2013
Merge branches 'master', 'master' and 'master' of https://github.com/e-learning/android-30-2013
Merge branch 'master' of https://github.com/e-learning/android-30-2013
Added number and comma buttons listeners
Merge remote-tracking branch 'origin/master'