Ver0.6.1
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls

Conflicts:
	server/app/models/Ship.scala
Merge branch 'master' of /home/yosuke/git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Ver 0.8.3
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Ver 0.8.3
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Ver 0.8.3
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls
Merge branch 'master' of /home/yosuke/service/../git/MyFleetGirls