added ASKBOT_MULTILINGUAL to settings.py template, tests fails if this is not present
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
fixed logging formating
wrapping migration 0161 in try/except because of auth_user table modification"
Merge branch 'master' of github.com:ASKBOT/askbot-devel

Conflicts:
	askbot/migrations/0161_add_field__user_languages.py
Merge branch 'master' of github.com:ASKBOT/askbot-devel
fixed import-data url in urls.py
Merge branch 'master' of github.com:ASKBOT/askbot-devel
updated settings template and startup procedures to make tinymce work
fixed django-tinymce version
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
fixed typo en WYSIWYG editor
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Merge branch 'master' of github.com:ASKBOT/askbot-devel