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

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/ve-media/anuncios

Conflicts:
	js/main.js
vlad