Merge remote-tracking branch 'origin/LJU' into KYW

Conflicts:
	Server_Seetreet/WebContent/public/css/youngwook/gov3.slider.css
141201-0218
Merge remote-tracking branch 'origin/KYW' into LJU