10.11.14
Merge branch 'master' of https://github.com/dakrizma/styria

Conflicts:
	db.sqlite3
	rss/__init__.pyc
	rss/admin.pyc
	rss/forms.pyc
	rss/migrations/0001_initial.pyc
	rss/migrations/0002_auto_20141103_1424.pyc
	rss/migrations/0003_delete_lista.pyc
	rss/migrations/0004_delete_lista.pyc
	rss/migrations/__init__.pyc
	rss/models.pyc
	rss/urls.py
	rss/urls.pyc
	rss/views.py
	rss/views.pyc
	styria/__init__.pyc
	styria/settings.pyc
	styria/urls.pyc
	styria/wsgi.pyc
10.11.14_2