Merge branch 'release/1.2.0'
add extra data(cv, birthday)
update
bug fix
update version
Merge commit '61f087456e4c21a5513da45ca8164754d667b20e'

Conflicts:
	build/precure-node.js
	build/precure-node.min.js
	build/precure.js
	build/precure.min.js
	docs/allstars.js.html
	docs/dokidoki.js.html
	docs/five.js.html
	docs/fivegogo.js.html
	docs/fresh.js.html
	docs/happinesscharge.js.html
	docs/heartcatch.js.html
	docs/index.html
	docs/main.js.html
	docs/maxheart.js.html
	docs/precure.Girl.html
	docs/precure.PartnerInvalidError.html
	docs/precure.Series.html
	docs/precure.html
	docs/smile.js.html
	docs/splashstar.js.html
	docs/suite.js.html
	docs/unmarked.js.html
	package.json
	spec/happinesschargeSpec.js
	src/dokidoki.js
	src/five.js
	src/fivegogo.js
	src/fresh.js
	src/happinesscharge.js
	src/heartcatch.js
	src/maxheart.js
	src/smile.js
	src/splashstar.js
	src/suite.js
	src/unmarked.js
Merge branch 'master' into develop

Conflicts:
	src/happinesscharge.js
bug fix
Merge branch 'hotfix/honey' into develop
release
Merge branch 'release/1.2.4' into develop
modify build script