Ks
Merge branch 'master' of github.com:ramsalt/kr

Conflicts:
	sites/default/themes/kr2012/compass-kr/stylesheets/base.css
	sites/default/themes/kr2012/compass-kr/stylesheets/global.css