Button style added
Merge branch 'master' of https://github.com/andyskw/Shisha-Manager

Conflicts:
	AndroidManifest.xml