change about in page controller
merge branch