local changes
Merge branch 'master' of github.com:aneumeier/feeds
more bs3 adaptions