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

Conflicts:
	Axa/app/app.js
	Axa/app/viewmodel/visit.js
Changes made by Boubaker Outoya (outoya.boubaker@gmail.com).