Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Merge branch 'master' of https://github.com/jeremynetkin/test.git

Conflicts:
	Axa/app/view/event/_postvisits.html
	Axa/app/view/event/postpostvisits.html
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).
Merge branch 'master' of https://github.com/jeremynetkin/test.git