merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1247 288da536-3c93-4ab2-bc2e-17a84f795b60
merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1248 288da536-3c93-4ab2-bc2e-17a84f795b60
merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1249 288da536-3c93-4ab2-bc2e-17a84f795b60
merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1250 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1251 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1252 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1253 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1254 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1255 288da536-3c93-4ab2-bc2e-17a84f795b60
add require.js

git-svn-id: https://svn.sinaapp.com/dilan/1@1256 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1257 288da536-3c93-4ab2-bc2e-17a84f795b60
d

git-svn-id: https://svn.sinaapp.com/dilan/1@1258 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1259 288da536-3c93-4ab2-bc2e-17a84f795b60
update

git-svn-id: https://svn.sinaapp.com/dilan/1@1260 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1261 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1262 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1263 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1264 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1265 288da536-3c93-4ab2-bc2e-17a84f795b60
u

git-svn-id: https://svn.sinaapp.com/dilan/1@1266 288da536-3c93-4ab2-bc2e-17a84f795b60