update version app
Merge branch 'master' of https://github.com/waar19/appinstarespuesta

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_es-es
	app/tmp/cache/persistent/myapp_cake_core_cake_es-es
	app/tmp/cache/persistent/myapp_cake_core_file_map
Merge branch 'master' of https://github.com/waar19/appinstarespuesta

Conflicts:
	app/Config/database.php
	app/View/Members/home.ctp
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_es-es
	app/tmp/cache/persistent/myapp_cake_core_cake_es-es
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log