Merge branch 'master' into AndiPatch
chance icon
Merge branch 'AndiPatch'
Merge branch 'master' into AndiPatch
consummation of the layouts: information
Merge branch 'master' of github.com:cracker0dks/SmartQuad3

Conflicts:
	App/SmartQuadProject/SmartQuad/src/main/res/layout/information.xml
Merge branch 'master' into AndiPatch
Merge branch 'master' of github.com:cracker0dks/SmartQuad3