commited by palli
Merge branch 'master' of https://github.com/shafqatjan/publicitus

Conflicts:
	.htaccess
	FCKeditor/_documentation.html
	FCKeditor/_upgrade.html
	FCKeditor/_whatsnew.html
	FCKeditor/_whatsnew_history.html
	FCKeditor/editor/css/behaviors/disablehandles.htc
	FCKeditor/editor/css/behaviors/hiddenfield.htc
	FCKeditor/editor/css/behaviors/showtableborders.htc
	FCKeditor/editor/css/fck_editorarea.css
	FCKeditor/editor/css/fck_internal.css
	FCKeditor/editor/css/fck_showtableborders_gecko.css
	FCKeditor/editor/dialog/common/fck_dialog_common.css
	FCKeditor/editor/dialog/common/fck_dialog_common.js
	FCKeditor/editor/dialog/common/fcknumericfield.htc
	FCKeditor/editor/dialog/common/moz-bindings.xml
	FCKeditor/editor/dialog/fck_about.html
	FCKeditor/editor/dialog/fck_anchor.html
	FCKeditor/editor/dialog/fck_button.html
	FCKeditor/editor/dialog/fck_checkbox.html
	FCKeditor/editor/dialog/fck_colorselector.html
	FCKeditor/editor/dialog/fck_div.html
	FCKeditor/editor/dialog/fck_docprops.html
	FCKeditor/editor/dialog/fck_docprops/fck_document_preview.html
	FCKeditor/editor/dialog/fck_flash.html
	FCKeditor/editor/dialog/fck_flash/fck_flash.js
	FCKeditor/editor/dialog/fck_flash/fck_flash_preview.html
	FCKeditor/editor/dialog/fck_form.html
	FCKeditor/editor/dialog/fck_hiddenfield.html
	FCKeditor/editor/dialog/fck_image.html
	FCKeditor/editor/dialog/fck_image/fck_image.js
	FCKeditor/editor/dialog/fck_image/fck_image_preview.html
	FCKeditor/editor/dialog/fck_link.html
	FCKeditor/editor/dialog/fck_link/fck_link.js
	FCKeditor/editor/dialog/fck_listprop.html
	FCKeditor/editor/dialog/fck_paste.html
	FCKeditor/editor/dialog/fck_radiobutton.html
	FCKeditor/editor/dialog/fck_replace.html
	FCKeditor/editor/dialog/fck_select.html
	FCKeditor/editor/dialog/fck_select/fck_select.js
	FCKeditor/editor/dialog/fck_smiley.html
	FCKeditor/editor/dialog/fck_source.html
	FCKeditor/editor/dialog/fck_specialchar.html
	FCKeditor/editor/dialog/fck_spellerpages.html
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
	FCKeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
	FCKeditor/editor/dialog/fck_table.html
	FCKeditor/editor/dialog/fck_tablecell.html
	FCKeditor/editor/dialog/fck_template.html
	FCKeditor/editor/dialog/fck_textarea.html
	FCKeditor/editor/dialog/fck_textfield.html
	FCKeditor/editor/dialog/fck_universalkey/data.js
	FCKeditor/editor/dialog/fck_universalkey/diacritic.js
	FCKeditor/editor/dialog/fck_universalkey/dialogue.js
	FCKeditor/editor/dialog/fck_universalkey/fck_universalkey.css
	FCKeditor/editor/dialog/fck_universalkey/multihexa.js
	FCKeditor/editor/dtd/fck_dtd_test.html
	FCKeditor/editor/dtd/fck_xhtml10strict.js
	FCKeditor/editor/dtd/fck_xhtml10transitional.js
	FCKeditor/editor/fckdebug.html
	FCKeditor/editor/fckdialog.html
	FCKeditor/editor/fckeditor.html
	FCKeditor/editor/fckeditor.original.html
	FCKeditor/editor/filemanager/browser/default/browser.css
	FCKeditor/editor/filemanager/browser/default/browser.html
	FCKeditor/editor/filemanager/browser/default/connectors/php/basexml.php
	FCKeditor/editor/filemanager/browser/default/connectors/php/commands.php
	FCKeditor/editor/filemanager/browser/default/connectors/php/config.php
	FCKeditor/editor/filemanager/browser/default/connectors/php/connector.php
	FCKeditor/editor/filemanager/browser/default/connectors/php/io.php
	FCKeditor/editor/filemanager/browser/default/connectors/php/util.php
	FCKeditor/editor/filemanager/browser/default/frmactualfolder.html
	FCKeditor/editor/filemanager/browser/default/frmcreatefolder.html
	FCKeditor/editor/filemanager/browser/default/frmfolders.html
	FCKeditor/editor/filemanager/browser/default/frmresourceslist.html
	FCKeditor/editor/filemanager/browser/default/frmresourcetype.html
	FCKeditor/editor/filemanager/browser/default/frmupload.html
	FCKeditor/editor/filemanager/browser/default/js/common.js
	FCKeditor/editor/filemanager/browser/default/js/fckxml.js
	FCKeditor/editor/filemanager/connectors/php/basexml.php
	FCKeditor/editor/filemanager/connectors/php/commands.php
	FCKeditor/editor/filemanager/connectors/php/config.php
	FCKeditor/editor/filemanager/connectors/php/connector.php
	FCKeditor/editor/filemanager/connectors/php/io.php
	FCKeditor/editor/filemanager/connectors/php/phpcompat.php
	FCKeditor/editor/filemanager/connectors/php/upload.php
	FCKeditor/editor/filemanager/connectors/php/util.php
	FCKeditor/editor/filemanager/connectors/test.html
	FCKeditor/editor/filemanager/connectors/uploadtest.html
	FCKeditor/editor/filemanager/upload/php/config.php
	FCKeditor/editor/filemanager/upload/php/upload.php
	FCKeditor/editor/filemanager/upload/php/util.php
	FCKeditor/editor/index.php
	FCKeditor/editor/js/fckadobeair.js
	FCKeditor/editor/js/fckeditorcode_gecko.js
	FCKeditor/editor/js/fckeditorcode_ie.js
	FCKeditor/editor/lang/_translationstatus.txt
	FCKeditor/editor/lang/af.js
	FCKeditor/editor/lang/ar.js
	FCKeditor/editor/lang/bg.js
	FCKeditor/editor/lang/bn.js
	FCKeditor/editor/lang/bs.js
	FCKeditor/editor/lang/ca.js
	FCKeditor/editor/lang/cs.js
	FCKeditor/editor/lang/da.js
	FCKeditor/editor/lang/de.js
	FCKeditor/editor/lang/el.js
	FCKeditor/editor/lang/en-au.js
	FCKeditor/editor/lang/en-ca.js
	FCKeditor/editor/lang/en-uk.js
	FCKeditor/editor/lang/en.js
	FCKeditor/editor/lang/eo.js
	FCKeditor/editor/lang/es.js
	FCKeditor/editor/lang/et.js
	FCKeditor/editor/lang/eu.js
	FCKeditor/editor/lang/fa.js
	FCKeditor/editor/lang/fi.js
	FCKeditor/editor/lang/fo.js
	FCKeditor/editor/lang/fr-ca.js
	FCKeditor/editor/lang/fr.js
	FCKeditor/editor/lang/gl.js
	FCKeditor/editor/lang/gu.js
	FCKeditor/editor/lang/he.js
	FCKeditor/editor/lang/hi.js
	FCKeditor/editor/lang/hr.js
	FCKeditor/editor/lang/hu.js
	FCKeditor/editor/lang/it.js
	FCKeditor/editor/lang/ja.js
	FCKeditor/editor/lang/km.js
	FCKeditor/editor/lang/ko.js
	FCKeditor/editor/lang/lt.js
	FCKeditor/editor/lang/lv.js
	FCKeditor/editor/lang/mn.js
	FCKeditor/editor/lang/ms.js
	FCKeditor/editor/lang/nb.js
	FCKeditor/editor/lang/nl.js
	FCKeditor/editor/lang/no.js
	FCKeditor/editor/lang/pl.js
	FCKeditor/editor/lang/pt-br.js
	FCKeditor/editor/lang/pt.js
	FCKeditor/editor/lang/ro.js
	FCKeditor/editor/lang/ru.js
	FCKeditor/editor/lang/sk.js
	FCKeditor/editor/lang/sl.js
	FCKeditor/editor/lang/sr-latn.js
	FCKeditor/editor/lang/sr.js
	FCKeditor/editor/lang/sv.js
	FCKeditor/editor/lang/th.js
	FCKeditor/editor/lang/tr.js
	FCKeditor/editor/lang/uk.js
	FCKeditor/editor/lang/vi.js
	FCKeditor/editor/lang/zh-cn.js
	FCKeditor/editor/lang/zh.js
	FCKeditor/editor/plugins/autogrow/fckplugin.js
	FCKeditor/editor/plugins/bbcode/_sample/sample.config.js
	FCKeditor/editor/plugins/bbcode/_sample/sample.html
	FCKeditor/editor/plugins/bbcode/fckplugin.js
	FCKeditor/editor/plugins/dragresizetable/fckplugin.js
	FCKeditor/editor/plugins/placeholder/fck_placeholder.html
	FCKeditor/editor/plugins/placeholder/fckplugin.js
	FCKeditor/editor/plugins/placeholder/lang/de.js
	FCKeditor/editor/plugins/placeholder/lang/en.js
	FCKeditor/editor/plugins/placeholder/lang/es.js
	FCKeditor/editor/plugins/placeholder/lang/fr.js
	FCKeditor/editor/plugins/placeholder/lang/it.js
	FCKeditor/editor/plugins/placeholder/lang/pl.js
	FCKeditor/editor/plugins/simplecommands/fckplugin.js
	FCKeditor/editor/plugins/tablecommands/fckplugin.js
	FCKeditor/editor/skins/_fckviewstrips.html
	FCKeditor/editor/skins/default/fck_dialog.css
	FCKeditor/editor/skins/default/fck_dialog_ie6.js
	FCKeditor/editor/skins/default/fck_editor.css
	FCKeditor/editor/skins/office2003/fck_dialog.css
	FCKeditor/editor/skins/office2003/fck_dialog_ie6.js
	FCKeditor/editor/skins/office2003/fck_editor.css
	FCKeditor/editor/skins/silver/fck_dialog.css
	FCKeditor/editor/skins/silver/fck_dialog_ie6.js
	FCKeditor/editor/skins/silver/fck_editor.css
	FCKeditor/fckconfig.js
	FCKeditor/fckeditor.afp
	FCKeditor/fckeditor.asp
	FCKeditor/fckeditor.cfc
	FCKeditor/fckeditor.cfm
	FCKeditor/fckeditor.js
	FCKeditor/fckeditor.lasso
	FCKeditor/fckeditor.php
	FCKeditor/fckeditor.pl
	FCKeditor/fckeditor.py
	FCKeditor/fckeditor_php4.php
	FCKeditor/fckeditor_php5.php
	FCKeditor/fckpackager.xml
	FCKeditor/fckstyles.xml
	FCKeditor/fcktemplates.xml
	FCKeditor/fckutils.cfm
	FCKeditor/htaccess.txt
	FCKeditor/index.php
	FCKeditor/license.txt
	FCKeditor/rough.php
	FCKeditor/userfiles/index.php
	admin/advertiser-manage.php
	admin/category-manage.php
	admin/change-password.php
	admin/cms-manage.php
	admin/downloadAdmin.php
	admin/expert-manage.php
	admin/faq-manage.php
	admin/index.php
	admin/logout.php
	admin/main.php
	admin/media-manage.php
	admin/mediatype-manage.php
	admin/prm-manage.php
	admin/reset-password.php
	admin/side-menu.php
	admin/user-expertise-manage.php
	admin/user-images-manage.php
	admin/user-media-manage.php
	advertiser/calender.php
	advertiser/change-password.php
	advertiser/edit-profile.php
	advertiser/index.php
	advertiser/my-pakages.php
	advform.php
	ajax/action.php
	ajax/forgotPwd.php
	ajax/index.php
	classes/Admin.class.php
	classes/Categories.class.php
	classes/ClientPaginate.class.php
	classes/Cms.class.php
	classes/Database.class.php
	classes/Education.class.php
	classes/Experience.class.php
	classes/MediaType.class.php
	classes/Paginate.class.php
	classes/Session.class.php
	classes/SimpleImage.class.php
	classes/User.class.php
	classes/UserCategoriesMap.class.php
	classes/UserExpertise.class.php
	classes/UserMedia.class.php
	classes/UserMediaMap.class.php
	classes/cMail.class.php
	classes/index.php
	colorbox/colorbox.css
	colorbox/jquery.colorbox-min.js
	colorbox/jquery.colorbox.js
	colorbox/jquery.min.js
	config/configuration.php
	config/index.php
	css/IE/style-IE-6.css
	css/IE/style-IE-7.css
	css/IE/style-IE-8.css
	css/admin.css
	css/colorpicker.css
	css/jscal2.css
	css/layout.css
	css/login.css
	css/style.css
	css/styleCallender.css
	expert/calender.php
	expert/change-password.php
	expert/edit-profile.php
	expert/index.php
	expert/profile.php
	expform.php
	facebox/facebox.css
	facebox/facebox.js
	facebox/index.php
	forget-password.php
	helpers/helper.php
	helpers/index.php
	images/index.php
	includes/admin-search-result.php
	includes/admin-search.php
	includes/calender.php
	includes/err-succ-info.php
	includes/fb_connect.php
	includes/footer.php
	includes/header.php
	includes/index.php
	includes/menu.php
	index.php
	js/admin.js
	js/border_rounded.js
	js/client.js
	js/datetimepicker/index.php
	js/datetimepicker/jquery-ui-timepicker-addon.js
	js/datetimepicker/jquery-ui.css
	js/datetimepicker/jquery.base.css
	js/datetimepicker/jquery.button.css
	js/datetimepicker/jquery.core.css
	js/datetimepicker/jquery.datepicker.css
	js/datetimepicker/jquery.ui.all.css
	js/datetimepicker/jquery.ui.css
	js/datetimepicker/jquery.ui.slider.css
	js/datetimepicker/ui.theme.css
	js/default.js
	js/en.js
	js/index.html
	js/index.php
	js/lib/index.php
	js/modernizr.js
	login.php
	logout.php
	manager/calender.php
	manager/change-password.php
	manager/edit-profile.php
	manager/index.php
	media/calender.php
	media/change-password.php
	media/edit-profile.php
	media/index.php
	media/my-pakage-posts.php
	media/my-posts.php
	media/pakage-detail.php
	media/pakage-post.php
	media/profile.php
	mform.php
	prmform.php
	raty/img/index.php
	raty/index.php
	raty/js/index.php
	raty/js/jquery.raty.js
	reset-password.php
	script-includes/FbRegister.php
	script-includes/create-album.php
	script-includes/forgot-pass.php
	script-includes/getData.php
	script-includes/getImage.php
	script-includes/group-student-detail.php
	script-includes/index.php
	script-includes/move-image-toalbum.php
	settings/index.php
	settings/settings.php
	uploadify/.htaccess
	uploadify/Change Log.txt
	uploadify/check-exists.php
	uploadify/index.php
	uploadify/jquery.uploadify-3.1.js
	uploadify/jquery.uploadify-3.1.min.js
	uploadify/license.txt
	uploadify/uploadify.css
	uploadify/uploadify.php
	uploadify/uploadify1.php
	varify.php
commited...