Changes made by ilink rao (raoilink@gmail.com).
Merge branch 'master' of https://github.com/dengshiying1989/happybaby.git

Conflicts:
	happybay/scripts/happybaby.js
	happybay/styles/happybaby.css
Merge branch 'master' of https://github.com/dengshiying1989/happybaby.git
Merge branch 'master' of https://github.com/dengshiying1989/happybaby.git