add manage
Merge branch 'master' of https://github.com/ISTang/Notification-Push

Conflicts:
	src/manage/server.js
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/css/jquery.dataTables.css
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/css/jquery.dataTables_themeroller.css
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/Sorting icons.psd
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/back_disabled.jpg
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/back_disabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/back_enabled.jpg
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/back_enabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/back_enabled_hover.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/favicon.ico
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/forward_disabled.jpg
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/forward_disabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/forward_enabled.jpg
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/forward_enabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/forward_enabled_hover.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/sort_asc.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/sort_asc_disabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/sort_both.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/sort_desc.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/sort_desc_disabled.png
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/images/unchecked.gif
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/js/jquery.dataTables.js
	src/manage/src/app-client/public/frameworks/DataTables-1.9.4/js/jquery.dataTables.min.js
	src/manage/src/app-client/public/frameworks/DataTables-Editable-1.3/js/jquery.dataTables.editable.js
	src/manage/src/app-client/public/frameworks/KeyTable.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/My97DatePicker.htm
	src/manage/src/app-client/public/frameworks/My97DatePicker/WdatePicker.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/calendar.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/config.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/lang/en.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/lang/zh-cn.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/lang/zh-tw.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/WdatePicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/datePicker.gif
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/default/datepicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/default/img.gif
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/whyGreen/bg.jpg
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/whyGreen/datepicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/skin/whyGreen/img.gif
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/lang/en.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/lang/zh-cn.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/lang/zh-tw.js
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/readme.txt
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/WdatePicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/datePicker.gif
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/default/datepicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/default/img.gif
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/whyGreen/bg.jpg
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/whyGreen/datepicker.css
	src/manage/src/app-client/public/frameworks/My97DatePicker/开发包/skin/whyGreen/img.gif
	src/manage/src/app-client/public/frameworks/jquery/jquery-1.9.1.js
	src/manage/src/app-client/public/frameworks/jquery/jquery-1.9.1.min.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/ajaxfileupload.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/complete.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/jAlert/images/important.gif
	src/manage/src/app-client/public/frameworks/jquery/plugins/jAlert/images/info.gif
	src/manage/src/app-client/public/frameworks/jquery/plugins/jAlert/images/title.gif
	src/manage/src/app-client/public/frameworks/jquery/plugins/jAlert/jquery.alerts.css
	src/manage/src/app-client/public/frameworks/jquery/plugins/jAlert/jquery.alerts.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_flat_75_ffffff_40x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_glass_65_ffffff_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_glass_75_dadada_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-icons_222222_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-icons_2e83ff_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-icons_454545_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-icons_888888_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/images/ui-icons_cd0a0a_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/base/jquery-ui.css
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui-themes/smoothness/jquery-ui-1.7.2.custom.css
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery-ui.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery.form.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery.jeditable.js
	src/manage/src/app-client/public/frameworks/jquery/plugins/jquery.validate.js
	src/manage/src/app-client/public/images/accent.png
	src/manage/src/app-client/public/images/bullet.png
	src/manage/src/app-client/public/images/favicon.ico
	src/manage/src/app-client/public/images/heroAccent.png
	src/manage/src/app-client/public/images/orderedList0.png
	src/manage/src/app-client/public/images/orderedList1.png
	src/manage/src/app-client/public/images/orderedList2.png
	src/manage/src/app-client/public/images/orderedList3.png
	src/manage/src/app-client/public/images/orderedList4.png
	src/manage/src/app-client/public/images/orderedList5.png
	src/manage/src/app-client/public/images/orderedList6.png
	src/manage/src/app-client/public/images/orderedList7.png
	src/manage/src/app-client/public/images/orderedList8.png
	src/manage/src/app-client/public/images/orderedList9.png
	src/manage/src/app-client/public/stylesheets/dialog.css
	src/manage/src/app-client/public/stylesheets/site.css
	src/manage/src/app-client/views/access-denied.html
	src/manage/src/app-client/views/accman.html
	src/manage/src/app-client/views/appman.html
	src/manage/src/app-client/views/footer.html
	src/manage/src/app-client/views/header.html
	src/manage/src/app-client/views/index.html
	src/manage/src/app-client/views/login.html
	src/manage/src/app-client/views/msgman.html
	src/manage/src/app-server/server.js
	src/manage/test/cory/cory.Page.js
	src/manage/test/cory/cory.Router.js
	src/manage/test/cory/cory.Server.js
	src/manage/test/cory/cory.UrlParser.js
	src/manage/test/main.js
	src/manage/test/test.js