commit
Merge branch 'master' of https://github.com/Marioasf/deliciaego

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_deliciae_bd_friends
	app/tmp/cache/models/myapp_cake_model_default_deliciae_bd_list
	app/tmp/cache/models/myapp_cake_model_default_deliciae_bd_posts
	app/tmp/cache/models/myapp_cake_model_default_deliciae_bd_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt
	app/tmp/cache/persistent/myapp_cake_core_cake_pt
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Commit