Merge remote-tracking branch 'origin/feature-#1' into feature-#5
ちょいいじ
タスク#7
Merge branch 'feature-#6' of https://github.com/yuki2006/rakunori.git into feature-#6
タスク#5
Merge branch 'feature-#5' of https://github.com/yuki2006/rakunori.git
into feature-#5

Conflicts:
	project.properties
Merge remote-tracking branch 'origin/feature-#6' into feature-#5
タスク#5
Merge branch 'feature-#5' into feature-#6

Conflicts:
	res/layout/port_list_adapter.xml