Merge branch 'develop'
Merge branch 'develop'
用 css 調整 height
modify for ruby
refine css
modify by mars
Merge branch 'master' into develop

Conflicts:
	2013_mom_AD/js/ad.js