s
Merge remote-tracking branch 'origin/Adrien' into new

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/WGE.apk
	bin/classes.dex
	bin/classes/uow/hackWE/WGZ/BuildConfig.class
	bin/classes/uow/hackWE/WGZ/R$attr.class
	bin/classes/uow/hsckWE/WGZ/MainActivity.class
	bin/classes/uow/hsckWE/WGZ/R$drawable.class
	bin/classes/uow/hsckWE/WGZ/R$id.class
	bin/classes/uow/hsckWE/WGZ/R$layout.class
	bin/classes/uow/hsckWE/WGZ/R$menu.class
	bin/classes/uow/hsckWE/WGZ/R$string.class
	bin/classes/uow/hsckWE/WGZ/R$style.class
	bin/classes/uow/hsckWE/WGZ/R.class
	bin/res/drawable-hdpi/ic_launcher.png
	bin/res/drawable-ldpi/ic_launcher.png
	bin/res/drawable-mdpi/ic_launcher.png
	bin/resources.ap_
	gen/uow/hsckWE/WGZ/R.java
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml
	src/uow/hsckWE/WGZ/MainActivity.java
Merge branch 'new' of https://github.com/Gleiphnir/WGE into new

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/WGE.apk
	bin/classes.dex
	bin/classes/uow/hackWE/WGZ/BuildConfig.class
	bin/classes/uow/hackWE/WGZ/R$attr.class
	bin/classes/uow/hsckWE/WGZ/MainActivity.class
	bin/classes/uow/hsckWE/WGZ/R$drawable.class
	bin/classes/uow/hsckWE/WGZ/R$id.class
	bin/classes/uow/hsckWE/WGZ/R$layout.class
	bin/classes/uow/hsckWE/WGZ/R$menu.class
	bin/classes/uow/hsckWE/WGZ/R$string.class
	bin/classes/uow/hsckWE/WGZ/R$style.class
	bin/classes/uow/hsckWE/WGZ/R.class
	bin/res/drawable-hdpi/ic_launcher.png
	bin/res/drawable-ldpi/ic_launcher.png
	bin/res/drawable-mdpi/ic_launcher.png
	bin/resources.ap_
	gen/uow/hsckWE/WGZ/R.java
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml
	src/uow/hsckWE/WGZ/MainActivity.java