招客宝适配NB3.0改版

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@19786 cb18d431-34ea-403b-8d8e-565e713bc7f9
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@19929 cb18d431-34ea-403b-8d8e-565e713bc7f9
Module complete
导航管理基本OK
fix bugs
招客宝-品牌旗舰店代码上库

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20032 cb18d431-34ea-403b-8d8e-565e713bc7f9
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20036 cb18d431-34ea-403b-8d8e-565e713bc7f9
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20037 cb18d431-34ea-403b-8d8e-565e713bc7f9
Merge branch 'work' into debug

Conflicts:
	jsrc/bbFlagShip.js
	view/bbFlagShipNavManage.html
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20039 cb18d431-34ea-403b-8d8e-565e713bc7f9
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20042 cb18d431-34ea-403b-8d8e-565e713bc7f9
招客宝品牌旗舰店

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20043 cb18d431-34ea-403b-8d8e-565e713bc7f9
Merge branch 'work' into debug
去除console.log
去除console.log

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20054 cb18d431-34ea-403b-8d8e-565e713bc7f9
删除console.log

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20055 cb18d431-34ea-403b-8d8e-565e713bc7f9
删除console.log
删除console.log

git-svn-id: http://boy.tuniu.com/svn/VND/UED/Nbooking/branch_aco@20056 cb18d431-34ea-403b-8d8e-565e713bc7f9
删除console.log
Merge branch 'work' into debug