เพิ่ม Controller ใหม่ ขั้นต้น
Merge branch 'master' of https://github.com/jessadayim/findtheroom

Conflicts:
	src/FTR/AdminBundle/Form/Building_siteType.php

	modified:   src/FTR/AdminBundle/Controller/Building_siteController.php
	modified:   src/FTR/AdminBundle/Controller/Ftr_logController.php
	modified:   src/FTR/AdminBundle/Controller/Ftr_logdetailController.php
	modified:   src/FTR/AdminBundle/Controller/PanelController.php
	modified:   src/FTR/AdminBundle/Controller/User_adminController.php
	modified:   src/FTR/AdminBundle/Controller/UseradminlistsController.php
	modified:   src/FTR/AdminBundle/Controller/UserownerlistsController.php
	modified:   src/FTR/AdminBundle/Form/Building_siteType.php
	modified:   src/FTR/AdminBundle/Resources/config/routing.yml
	modified:   src/FTR/AdminBundle/Resources/config/routing/building_site.yml
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/edit.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/index.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/new.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/show.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/buildingsitelists.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/signin.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/useradminlists.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/userownerlists.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Layout/panel_layout.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/User_admin/index.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/User_admin/show.html.twig
	modified:   src/FTR/AdminBundle/Tests/Controller/Ftr_logControllerTest.php
	modified:   src/FTR/AdminBundle/Tests/Controller/Ftr_logdetailControllerTest.php
	modified:   src/FTR/AdminBundle/Tests/Controller/User_adminControllerTest.php
	modified:   src/FTR/WebBundle/Controller/ContactController.php
	modified:   src/FTR/WebBundle/Controller/MainController.php
	modified:   src/FTR/WebBundle/Controller/RegisterController.php
	modified:   src/FTR/WebBundle/Resources/config/routing.yml
	modified:   src/FTR/WebBundle/Resources/views/Contact/contact.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Detail/detail.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Layout/Layout.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Main/index.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Security/login.html.twig
	renamed:    web/captcha/bg.jpg -> web/bg.jpg
	new file:   web/captcha/Harabara.ttf
	modified:   web/captcha/bg.jpg
	new file:   web/captcha/captcha_img.jpg
	new file:   web/captcha/php/image_req.php
	new file:   web/captcha/test.jpg
	modified:   web/css/main.css
	new file:   web/css/paging/smartpaginator.buildingsite.css
	modified:   web/css/panel/960_12.css
	modified:   web/css/panel/reset.css
	modified:   web/css/panel/style.css
	modified:   web/css/panel/vertical-menu.css
	modified:   web/images/footer2.png
	new file:   web/js/paging/smartpaginator.buildingsite.js
	modified:   web/js/panel/chart/adapters/mootools-adapter.src.js
	modified:   web/js/panel/chart/adapters/prototype-adapter.src.js
	modified:   web/js/panel/chart/highcharts-more.js
	modified:   web/js/panel/chart/highcharts.js
	modified:   web/js/panel/chart/highcharts.src.js
	modified:   web/js/panel/chart/modules/canvas-tools.js
	modified:   web/js/panel/chart/modules/canvas-tools.src.js
	modified:   web/js/panel/chart/modules/exporting.js
	modified:   web/js/panel/chart/modules/exporting.src.js
	modified:   web/js/panel/chart/themes/dark-blue.js
	modified:   web/js/panel/chart/themes/dark-green.js
	modified:   web/js/panel/chart/themes/gray.js
	modified:   web/js/panel/chart/themes/grid.js
	modified:   web/js/panel/chart/themes/skies.js