adf
Merge branch 'master' of https://github.com/unisexx/adf

Conflicts:
	application/modules/adfrees/views/index.php