Minor fixes
Merge branch 'master' of https://github.com/HanabiDev/ElDiario

Conflicts:
	ElDiario/settings.pyc
	admin/urls.pyc
	frontend/templates/site_index.html
	frontend/templatetags/front_tags.py
	frontend/templatetags/front_tags.pyc
	main_page/__init__.pyc
	main_page/models.pyc
	main_page/urls.pyc
	main_page/views.pyc
	photogallery/models.pyc
Minor fix
minor fix
Merge branch 'master' of https://github.com/HanabiDev/ElDiario
Nullmess
Minor fixed