ed
Merge branch 'master' of https://github.com/ve-media/anuncios

Conflicts:
	index.php
	js/main.js