Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/drawable/textfield_style1.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e46d6adf8c42e4a22d729188150420c6a1df5f80.
Merge branch 'master' of https://github.com/Kiinz/QrCodeQuestion

Conflicts:
	res/drawable/textfield_style1.xml
	res/layout/activity_registration.xml
Merge branch 'master' of https://github.com/Kiinz/QrCodeQuestion

Conflicts:
	res/drawable/textfield_style1.xml
Merge branch 'master' of https://github.com/Kiinz/QrCodeQuestion