کلی
Merge branch 'master' of https://www.github.com/mmcomp/darma_web

Conflicts:
	android/android_version.php
	class/brand_class.php
	class/conf.php
	main/index.php
	main/kalaProfile.php
	main/test_1.php
Merge branch 'master' of https://www.github.com/mmcomp/darma_web
شاکری: حذف pdf ها