Merge branch 'master' of github.com:ecofunds/ecofunds
Fix media dir
fix settings module
Merge remote-tracking branch 'origin/master'