Random commit  (add Planning et CAD planning)
efn iuf qz:; f;:flvnjl fnvkj ql, ljqlj
Merge branch 'develop' of https://github.com/vdruon/PuyDuFou into HEAD
aznhdsf;: d:;er :;er  gr :;ds :;dfv :df:;, : l:f ;,: rg l:er l, q,
ezf ekfvl qrd: ml; m7
troolol
ze g sdf  Merge branch 'develop' of https://github.com/vdruon/PuyDuFou into develop

Conflicts:
	bin/PuyDuFou.apk
	bin/classes.dex
	bin/classes/com/mvmc/puydufou/MainActivity$DrawerItemClickListener.class
	bin/classes/com/mvmc/puydufou/MainActivity.class
	bin/classes/com/mvmc/puydufou/R$drawable.class
	bin/classes/com/mvmc/puydufou/R$id.class
	bin/classes/com/mvmc/puydufou/R$layout.class
	bin/classes/com/mvmc/puydufou/R$string.class
	bin/classes/com/mvmc/puydufou/R$style.class
	bin/classes/com/mvmc/puydufou/R$styleable.class
	bin/classes/com/mvmc/puydufou/adapters/SpectacleAdapter.class
	bin/classes/com/mvmc/puydufou/fragments/FragmentInfos.class
	bin/classes/com/mvmc/puydufou/fragments/FragmentSpectacles.class
	bin/classes/com/mvmc/puydufou/fragments/FragmentSpectalesDetails.class
	bin/resources.ap_
	gen/com/mvmc/puydufou/R.java
	res/values/strings.xml
	src/com/mvmc/puydufou/MainActivity.java
fuck u biatch

Conflicts:
	bin/PuyDuFou.apk
	bin/classes.dex
	bin/classes/com/mvmc/puydufou/MainActivity.class
	bin/classes/com/mvmc/puydufou/R$id.class
	bin/classes/com/mvmc/puydufou/R$layout.class
	bin/classes/com/mvmc/puydufou/R$string.class
	bin/classes/com/mvmc/puydufou/R$style.class
	bin/classes/com/mvmc/puydufou/R$styleable.class
	bin/classes/com/mvmc/puydufou/fragments/FragmentSpectalesDetails.class
	bin/resources.ap_
Merge branch 'develop' of https://github.com/vdruon/PuyDuFou into develop
LOL