Beauty buttons, next step DB to use on the number/buttons/codes
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
	src/com/application/Multiel/MainActivity.java
Beauty buttons, next step DB to use on the number/buttons/codes