What were the key aspects of the 2011 Fukuoka City merger in Fukuoka, Japan?