Added more step 2 layout
Merge localOrigin/master

Conflicts:
	www/js/controllers.js
Merge localOrigin/master

Conflicts:
	www/js/controllers.js
	www/js/services.js
	www/partials/patient/createAppointmentStep1.html
	www/partials/patient/createAppointmentStep2.html
Translated french strings
Fixed sweeping bug
Merge localOrigin/master
Merge localOrigin/master
Merge origin/master

Conflicts:
	www/js/controllers.js
	www/partials/patient/createAppointmentStep3.html