h
v
Merge branch 'master' of https://github.com/abasrafiq/dab

Conflicts:
	application/config/config.php
	application/language/dari/mci_lang.php
	public_html/.htaccess