- layout appointments
- bug appointments next/prev day being fixed
Merge origin/master

Conflicts:
	plugins/android.json
	www/js/controllers.js
	www/partials/doctor/appointmentsView.html