media added
removed conflicts
Merge branch 'master' of github.com:vargi/geziforumlari