CRLF will be replaced by LF
Fix incorrect detection of string as php-format by xgettext.

Because of "100%" in the string, xgettext thinks this is a format string. This is wrong, so add the appropriate tag to correct the heuristics.
Merge pull request #779 from vslavik/patch-1

Fix incorrect detection of string as php-format by xgettext.
Version 3.2.0

Conflicts:
	oc-includes/osclass/assets/js/tiny_mce/plugins/ajaxfilemanager/inc/config.base.php
Merge branch 'master' of github.com:osclass/Osclass
Hide "Login" and "Register" links when users are disabled in User Settings

Hide "Login" and "Register" links when users are disabled in User Settings instead of flash message showing "Users not enabled".
Merge pull request #931 from extr/patch-2

Hide "Login" and "Register" links when users are disabled in User Settin...
Update functions.php

End Tag for <img .. /> added.
Merge pull request #970 from hyperion4ever/patch-2

Update functions.php

Thanks for the help
Update reported.php
Merge pull request #980 from gilden-/patch-1

Thanks!
Revert "Merge pull request #980 from gilden-/patch-1"

This reverts commit 20dcd16bd925fd7280a7dc195ea4fd7ace1ab17f, reversing
changes made to fdf92055dd566ed9bb2f7286978041b6db0c40c8.
Version 3.2.2
Version 3.2.2

* hotfixes: (123 commits)
  Version 3.2.2
  small fix
  missing pagination on bender theme, issue #899 and pull-request #1085
  added support for mb_strlen in case mbstring extension is not installed
  missed attr on Item->metaFields()
  added comments
  fixed #1091, allowed GET params on 'seo' urls, minor improvements
  the previous function was removing some 0 (zero) values, this fix that
  issue #1090 params in search_url are cleaned before making the url
  some helpers were missing
  fix on search_url
  put it back
  small improvement too
  small fix on multiple categories selcets showing ALL the categories instead of only the enabled ones
  "list_*" and "search_*", two different name with same purpose
  Do we need to call doSearch again?
  some fixes , issue #1080 the problem is not fixed, but we stopped using the functions since they're not really needed
  added some more code
  added suport for attachment in contact form
  fixed #1036, added missed validations
  ...
Version 3.2.2

* hotfixes:
  Version 3.2.2
  copied bender into gui
  small fix

Conflicts:
	oc-includes/osclass/installer/readme.php
Update user-items.php

Pre-closure of div tag. it should be in line #72 instead of #51 (out of the else condition)
this will affect the footer(footer is wrapped, should be outside the wrapper)
Merge pull request #1168 from ameenullah/patch-1

Update user-items.php
Merge branch 'develop'

* develop: (160 commits)
  issue #1239
  show error on ajax uploader, fix some CSS
  fix place holder / label of expiration days in the amdin panel add listing
  release notes updated to 3.3.0 stable
  some filters added
  issue #1239
  added placeholder file
  issue #1222
  issue #1240
  issue / pull reuqest #1236
  forgot to move Arial.ttf to new location
  issue #1237
  Can read category/
  Arial.ttf moved to /fonts subfolder
  updated bender
  small fix on canonical region urls without category
  issue #1224
  issue #1223
  issue #1220
  updated po files, also updated gui folder with bender theme
  ...

Conflicts:
	oc-content/themes/bender
	oc-content/themes/bender/functions.php
	oc-content/themes/bender/header.php
	oc-content/themes/bender/user-items.php
	oc-includes/osclass/installer/readme.php
Remove submodule bender
Remove bender from .gitignore