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

Conflicts:
	templates/events/event_detail.html
Merge pull request #151 from diegoduncan21/master

#136 arreglando events details