Merge branches 'master' and 'master' of https://github.com/e-learning/android-30-2013
Add layout of calculator
Merge branch 'master' of https://github.com/e-learning/android-30-2013