code review
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	coffee/controller.coffee
	coffee/directive-pd-ymap.coffee
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	partials/detail_army_unit.html