its safer not to rebase in this script..
fixed minor settings layout
Merge branch 'News' into develop
replaced news cells in building detail
Merge branch 'News' into develop