form search
formsearch
Merge branch 'master' of https://github.com/jessadayim/findtheroom

Conflicts:
	src/FTR/WebBundle/Resources/views/List/index.html.twig

	new file:   src/FTR/AdminBundle/Controller/AdvertisingdetailController.php
	modified:   src/FTR/AdminBundle/Controller/Building_siteController.php
	new file:   src/FTR/AdminBundle/Controller/BuildingsitelistsController.php
	new file:   src/FTR/AdminBundle/Controller/BuildingtypelistsController.php
	new file:   src/FTR/AdminBundle/Controller/DashboardController.php
	new file:   src/FTR/AdminBundle/Controller/FacilitylistsController.php
	new file:   src/FTR/AdminBundle/Controller/NearlylocationlistsController.php
	new file:   src/FTR/AdminBundle/Controller/NearlytypelistsController.php
	new file:   src/FTR/AdminBundle/Controller/PanelController.php
	new file:   src/FTR/AdminBundle/Controller/PaytypelistsController.php
	new file:   src/FTR/AdminBundle/Controller/RoomtypelistsController.php
	new file:   src/FTR/AdminBundle/Controller/SitedetailController.php
	new file:   src/FTR/AdminBundle/Controller/UseradminlistsController.php
	new file:   src/FTR/AdminBundle/Controller/UserownerlistsController.php
	new file:   src/FTR/AdminBundle/Controller/ZonelistsController.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/new.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/advertisingdetail.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/buildingsitelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/buildingtypelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/dashboard.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/facilitylists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/nearlylocationlists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/nearlytypelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/paytypelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/roomtypelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/signin.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/sitedetail.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/useradminlists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/userownerlists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Ftr_panel/zonelists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Layout/panel_layout.html.twig
	modified:   src/FTR/WebBundle/Resources/views/List/index.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Main/index.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Search/search.html.twig
	modified:   web/captcha/test.jpg
	modified:   web/css/global.css
	modified:   web/css/main.css
	new file:   web/css/panel/960_12.css
	new file:   web/css/panel/general.css
	new file:   web/css/panel/reset.css
	new file:   web/css/panel/style.css
	new file:   web/css/panel/vertical-menu.css
	new file:   web/images/panel/bg_header.jpg
	new file:   web/images/reset-b.png
	new file:   web/images/search-b.png
	modified:   web/js/paging/jquery.paginate.js
	new file:   web/js/panel/chart/adapters/mootools-adapter.js
	new file:   web/js/panel/chart/adapters/mootools-adapter.src.js
	new file:   web/js/panel/chart/adapters/prototype-adapter.js
	new file:   web/js/panel/chart/adapters/prototype-adapter.src.js
	new file:   web/js/panel/chart/highcharts-more.js
	new file:   web/js/panel/chart/highcharts.js
	new file:   web/js/panel/chart/highcharts.src.js
	new file:   web/js/panel/chart/modules/canvas-tools.js
	new file:   web/js/panel/chart/modules/canvas-tools.src.js
	new file:   web/js/panel/chart/modules/exporting.js
	new file:   web/js/panel/chart/modules/exporting.src.js
	new file:   web/js/panel/chart/themes/dark-blue.js
	new file:   web/js/panel/chart/themes/dark-green.js
	new file:   web/js/panel/chart/themes/gray.js
	new file:   web/js/panel/chart/themes/grid.js
	new file:   web/js/panel/chart/themes/skies.js