- Fixed January and December titles not being displayed correctly
Merge origin/master

Conflicts:
	www/js/controllers.js