#136
Merge branch 'master' of https://github.com/PyAr/pyarweb

Conflicts:
	templates/events/event_detail.html
Hide sidebar news #137
Merge pull request #152 from ihuro/master

Hide sidebar news #137
update requirements
Update settings.py
Merge pull request #151 from diegoduncan21/master

#136 arreglando events details
Merge branch 'master' of https://github.com/PyAr/pyarweb