areaを野々市版へ
Merge branch 'master' of https://github.com/NonoichiSpending/5374_nonoichi

Conflicts:
	5374colormanual.pdf
	README.md
	Rakefile
	apple-touch-icon-precomposed.png
	css/bootstrap.css
	css/bootstrap.min.css
	css/custom.css
	data/area_days.csv
	data/center.csv
	data/description.csv
	data/target.csv
	img/bin.svg
	img/bin02.svg
	img/moyasanai.svg
	img/moyasanai02.svg
	img/moyasu.svg
	img/moyasu02.svg
	img/setting.svg
	img/setting02.svg
	img/shigen.svg
	img/shigen02.svg
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/jquery-1.10.2.min.js
	js/respond.min.js
	js/script.js
	js/setting.js
	test.html
	test/test.html
	test/unit.js
	unused/area.kml
	unused/area_candidate.php
	unused/lib/PointLocation.php