revisions
Merge branch 'master' of https://github.com/ddedep/Jenny

Conflicts:
	application/views/viewAd3.php