added buttons
Merge branch 'master' of https://github.com/stprima/BeshtoTalkie

Conflicts:
	res/layout/login.xml
3262h
f