Fix bug with font size, img display on about page
Merge pull request #1 from wendycan/feature/framework_migration

Feature/framework migration
Merge remote-tracking branch 'up/master'

Conflicts:
	source/localizable/about.cn.html.haml
	source/stylesheets/_about.css.scss
	source/stylesheets/_index.css.scss
	source/stylesheets/_nav.css.scss
Improve css structure
Modified global styles mainly
Fix bug with button on index page
Modified css files
Modified footer
Fix bug with font-family redefined
Merge pull request #6 from wendycan/feature/improvement_css

Improve css