テンプレート外観の編集
Merge branch 'master' of https://github.com/KentaKomai/SOHYA

Conflicts:
	app/assets/images/bg_main.jpg
	app/assets/images/btn_list_switch_01.png
	app/assets/images/btn_list_switch_02.png
	app/assets/images/btn_pagetop.png
	app/assets/images/btn_search.png
	app/assets/images/icon_block_a_01.png
	app/assets/images/icon_block_a_02.png
	app/assets/images/icon_block_a_03.png
	app/assets/images/icon_block_b_01.png
	app/assets/images/icon_block_b_02.png
	app/assets/images/icon_block_b_03.png
	app/assets/images/icon_time_filter_01.png
	app/assets/images/icon_time_filter_02.png
	app/assets/images/icon_time_filter_03.png
	app/assets/images/icon_time_filter_04.png
	app/assets/images/icon_time_filter_05.png
	app/assets/images/img_userstatus01.jpg
	app/assets/images/logo.png
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.haml