fixing log.txt
add file_data.php, update two files for push
Merge branch 'master' of https://bitbucket.org/lamafia/hf_gae_php
latest
Merge branch 'master' of https://bitbucket.org/lamafia/hf_gae_php

Conflicts:
	controller/item_instance_ctrl.php