Merge pull request #106 in YIN/basic from bugfix/YIN-268 to develop

# By ShuaiDu
# Via ShuaiDu
* commit 'a4a67cb41b1a18897d86ba66f615c51b74641f66':
  update bootstrap
  modify the bootstrap to 3.0 update the Anonymous purchase show name "匿名购买"
  fixed the order can't submit bug
Merge pull request #108 in YIN/basic from feature/YIN-255-update-profile-password-payment-address to develop

# By changhai.lin
# Via changhai.lin
* commit 'de73bb0d8fce9be5b092254bd5ca28443d56298d':
  update profile/password/payment/address
update profile/password/payment/address
no message
change the style
no message
Merge branch 'develop' into feature/YIN-255-update-profile-password-payment-address

Conflicts:
	protected/config/main.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Merge pull request #110 in YIN/basic from bugfix/YIN-283-http-localhost-backend.php-cms-newslettersubscriber-index to develop

# By ye.hou
# Via ye.hou
* commit 'ca10b080dc0b20dd18136e0dd3a398f2c2dadf4c':
  change the style
fixed the order can't submit bug
modify the bootstrap to 3.0
update the Anonymous purchase show name "匿名购买"
update bootstrap
fixed deliver button
upgrade database(alter table order_log order_id order_id bigint )
Merge pull request #112 in YIN/basic from bugfix/YIN-268 to develop

# By ShuaiDu
# Via ShuaiDu
* commit 'bc79c00513bdb70cc480eed084066469ab88704f':
  upgrade database(alter table order_log order_id order_id bigint )
  fixed deliver button
no message
no message
delete common.css
migrate database
database rc10