Estado final

Arreglado bug con prod/con, añadidas distintas carpetas con los layouts
Merge remote-tracking branch 'origin/master'

Conflicts:
	APK/ProdConApp.apk
	workspace/ProdConApp/src/com/fromthebench/prodcon/Consumer.java
	workspace/ProdConApp/src/com/fromthebench/prodcon/ProCon.java
	workspace/ProdConApp/src/com/fromthebench/prodcon/Producer.java