Merge branch 'development'
about text-align fix