temp commit
新規登録　INSERTできてないです・・・
Merge remote-tracking branch 'origin/v20140308' into v20140308

Conflicts:
	libs/core.php
Merge remote-tracking branch 'origin/v20140308' into v20140308