test
Merge branch 'master' of https://github.com/finpo/marryrice.git

Conflicts:
	marryrice/public/ckfinder/.DS_Store
嵌入Google Map