Merge branch 'master' into bootstrap
Removing redirects from apache

Now it's all on Django
Merge branch 'master' into bootstrap

Conflicts:
	src/accounts/templates/accounts/signup-form.html
	src/accounts/templates/accounts/user-profile.html
	src/colab/deprecated/templates/account_change_password.html
	src/colab/deprecated/templates/account_request_reset_password.html
	src/colab/deprecated/templates/base.html
	src/colab/deprecated/templates/login.html
Adding jquery and glyficons css
Finishin CSS on discution
Updating feedzilla
Moving conversejs to it's own app
Loading conversejs using app
Removing converse.js from colab
Adding converse.js as external dep
Assing style to Sign Up page
Fixing planet's rss posts
Fixing filtered tag option
Removing the COLAB that was shown unnecessarily
Adding css to message-thread
Changing avatar from class to id
Changing Planet index and adding some trans
Fixing Converse JS css
Adding CSS to user profile
Adding CSS to open-data