Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/pieuw/avalanche/Mainmenu$1.class
	bin/classes/com/pieuw/avalanche/Mainmenu$2.class
	bin/classes/com/pieuw/avalanche/Mainmenu$3.class
	bin/classes/com/pieuw/avalanche/Mainmenu$4.class
	bin/classes/com/pieuw/avalanche/Mainmenu.class
	bin/classes/com/pieuw/avalanche/R$layout.class
	bin/classes/com/pieuw/avalanche/R$string.class
	bin/classes/com/pieuw/avalanche/R$style.class
	bin/classes/com/pieuw/avalanche/R$styleable.class
	gen/com/pieuw/avalanche/R.java
	res/values/strings.xml
	src/com/pieuw/avalanche/Mainmenu.java