bug fix UnicodeDecodeError on news add/edit
version bump
bugfix UnicodeDecodeError
version bump
bugfix UnicodeDecodeError

Since each object has __unicode__() method defined, when we call unicode() on an object, the __unicode__() method is called and Django will take care of the conversion automatically.
version bump
#1372 fix jquery conflict issues
merge with the latest master and fix merge conflicts