update changelog
Merge pull request #1251 from conejoninja/develop

update changelog
update to version 3.3.0
issue #1253 (this should be fixed too, but I couldn't reproduce the issue) and #1254  (for sure)
Merge pull request #1257 from conejoninja/gd

issue #1253 (this should be fixed too, but I couldn't reproduce the issu...
fix issue that languages were being downloaded from the market but not being installed
ops! I forgot to remove something
issue #1243
'http://' is added to user's website if the url does not start with http or https
Merge pull request #1260 from conejoninja/editimg

ops! I forgot to remove something
Merge pull request #1261 from conejoninja/lang

fix issue that languages were being downloaded from the market but not b...
some fixes on i18n of fancybox and comments pagination
Merge pull request #1273 from conejoninja/i18n

some fixes on i18n of fancybox and comments pagination
Merge pull request #1276 from conejoninja/1243

issue #1243
update some info
Merge pull request #1277 from conejoninja/hotfixes

update some info
Merge remote-tracking branch 'upstream/hotfixes' into mastermerge

Conflicts:
	CHANGELOG.txt
Merge pull request #1281 from conejoninja/mastermerge

Mastermerge