Resolved conflicts for pulling from testing branch

1 files changed, 0 insertions, 147 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index bf23f9aa..0e0b4bd4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -27,36 +27,6 @@ include wqflask/wqflask/static/new/javascript/*
 include wqflask/wqflask/static/new/javascript/node_modules/*
 include wqflask/wqflask/static/new/javascript/node_modules/.bin/*
 include wqflask/wqflask/static/new/packages/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/dist/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/lib/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/localization/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/marketo/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/marketo/images/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/captcha/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/captcha/fonts/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/captcha/images/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/images/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tabs/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/js/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/login/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/login/images/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/css/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/milk/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/multipart/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/multipart/js/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/simple/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/simple/img/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/simple/langs/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/simple/skins/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/demo/tinymce/themes/simple/skins/default/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/test/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/test/qunit/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/test/selects/*
-include wqflask/wqflask/static/new/packages/ValidationPlugin/test/firebug/*
 include wqflask/wqflask/static/new/packages/nvd3/*
 include wqflask/wqflask/static/new/packages/noUiSlider/*
 include wqflask/wqflask/static/new/packages/DataTables/*
@@ -82,15 +52,6 @@ include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold
 include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold/6_delayed_rendering/*
 include wqflask/wqflask/static/new/packages/DataTables/unit_testing/tests_onhold/1_dom/*
 include wqflask/wqflask/static/packages/*
-include wqflask/wqflask/static/packages/TableTools/*
-include wqflask/wqflask/static/packages/TableTools/media/*
-include wqflask/wqflask/static/packages/TableTools/media/images/*
-include wqflask/wqflask/static/packages/TableTools/media/images/psd/*
-include wqflask/wqflask/static/packages/TableTools/media/swf/*
-include wqflask/wqflask/static/packages/TableTools/media/js/*
-include wqflask/wqflask/static/packages/TableTools/media/css/*
-include wqflask/wqflask/static/packages/TableTools/media/as3/*
-include wqflask/wqflask/static/packages/TableTools/media/as3/lib/*
 include wqflask/wqflask/static/packages/underscore/*
 include wqflask/wqflask/static/packages/bootstrap/*
 include wqflask/wqflask/static/packages/bootstrap/fonts/*
@@ -108,90 +69,6 @@ include wqflask/wqflask/static/packages/novus-nvd3-d51729c/src/models/backup/*
 include wqflask/wqflask/static/packages/novus-nvd3-d51729c/examples/*
 include wqflask/wqflask/static/packages/novus-nvd3-d51729c/examples/images/*
 include wqflask/wqflask/static/packages/DT_bootstrap/*
-include wqflask/wqflask/static/packages/ckeditor/*
-include wqflask/wqflask/static/packages/ckeditor/lang/*
-include wqflask/wqflask/static/packages/ckeditor/adapters/*
-include wqflask/wqflask/static/packages/ckeditor/skins/*
-include wqflask/wqflask/static/packages/ckeditor/skins/moono/*
-include wqflask/wqflask/static/packages/ckeditor/skins/moono/images/*
-include wqflask/wqflask/static/packages/ckeditor/skins/moono/images/hidpi/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/div/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/div/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/a11yhelp/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/a11yhelp/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/a11yhelp/dialogs/lang/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/templates/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/templates/templates/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/templates/templates/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/templates/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/find/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/find/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/scayt/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/scayt/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/dialog/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/flash/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/flash/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/flash/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/about/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/about/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/about/dialogs/hidpi/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/pastefromword/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/pastefromword/filter/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/specialchar/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/specialchar/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/specialchar/dialogs/lang/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/wsc/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/wsc/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/forms/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/forms/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/forms/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/link/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/link/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/link/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/link/images/hidpi/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/iframe/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/iframe/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/iframe/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/colordialog/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/colordialog/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/table/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/table/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/smiley/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/smiley/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/smiley/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/liststyle/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/liststyle/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/clipboard/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/clipboard/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/showblocks/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/showblocks/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/pagebreak/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/pagebreak/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/magicline/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/magicline/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/magicline/images/hidpi/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/preview/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/image/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/image/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/image/images/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/tabletools/*
-include wqflask/wqflask/static/packages/ckeditor/plugins/tabletools/dialogs/*
-include wqflask/wqflask/static/packages/ckeditor/samples/*
-include wqflask/wqflask/static/packages/ckeditor/samples/assets/*
-include wqflask/wqflask/static/packages/ckeditor/samples/assets/uilanguages/*
-include wqflask/wqflask/static/packages/ckeditor/samples/assets/outputxhtml/*
-include wqflask/wqflask/static/packages/ckeditor/samples/assets/inlineall/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/dialog/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/dialog/assets/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/enterkey/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/toolbar/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/magicline/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/htmlwriter/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/htmlwriter/assets/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/*
-include wqflask/wqflask/static/packages/ckeditor/samples/plugins/wysiwygarea/*
 include wqflask/wqflask/static/packages/colorbox/*
 include wqflask/wqflask/static/packages/colorbox/example5/*
 include wqflask/wqflask/static/packages/colorbox/example5/images/*
@@ -220,30 +97,6 @@ include wqflask/wqflask/static/packages/pragmaticly-smart-time-ago-40fa376/test/
 include wqflask/wqflask/static/packages/pragmaticly-smart-time-ago-40fa376/test/specs/*
 include wqflask/wqflask/static/packages/pragmaticly-smart-time-ago-40fa376/src/*
 include wqflask/wqflask/static/packages/pragmaticly-smart-time-ago-40fa376/src/locales/*
-include wqflask/wqflask/static/packages/jqplot/*
-include wqflask/wqflask/static/packages/jqplot/docs/*
-include wqflask/wqflask/static/packages/jqplot/docs/index/*
-include wqflask/wqflask/static/packages/jqplot/docs/styles/*
-include wqflask/wqflask/static/packages/jqplot/docs/files/*
-include wqflask/wqflask/static/packages/jqplot/docs/files/images/*
-include wqflask/wqflask/static/packages/jqplot/docs/files/plugins/*
-include wqflask/wqflask/static/packages/jqplot/docs/search/*
-include wqflask/wqflask/static/packages/jqplot/docs/javascript/*
-include wqflask/wqflask/static/packages/jqplot/examples/*
-include wqflask/wqflask/static/packages/jqplot/examples/colorpicker/*
-include wqflask/wqflask/static/packages/jqplot/examples/colorpicker/images/*
-include wqflask/wqflask/static/packages/jqplot/examples/images/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/js/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/css/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/css/smoothness/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/css/smoothness/images/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/css/ui-lightness/*
-include wqflask/wqflask/static/packages/jqplot/examples/jquery-ui/css/ui-lightness/images/*
-include wqflask/wqflask/static/packages/jqplot/examples/syntaxhighlighter/*
-include wqflask/wqflask/static/packages/jqplot/examples/syntaxhighlighter/scripts/*
-include wqflask/wqflask/static/packages/jqplot/examples/syntaxhighlighter/styles/*
-include wqflask/wqflask/static/packages/jqplot/plugins/*
 include wqflask/wqflask/correlation_matrix/*
 include wqflask/wqflask/show_trait/*
 include wqflask/wqflask/wgcna/*