- CSS fixes to appointmentsView
- CSS fixes to appointmentsView
- Start step 3
- Removed: unneeded check on years when going to calendar view.
- Added: commentary
- Added: documentation
- Removed: unneeded event listener on ICASA logo
- Update: Bootstrap documentation
Merge origin/master

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

Conflicts:
	www/js/controllers.js