Añadidos textViews de preferencias general.
Merge branch 'master' of https://github.com/SpongeSoft/DietApp.git

Conflicts:
	src/com/spongesoft/bananarun/ListBarGraphs.java
	src/com/spongesoft/bananarun/ListGraphsActivity.java