- Fixed: refresh improved, does not reïnitiate every time the page is visited. Calendar now also updates.
Merge origin/master

Conflicts:
	www/js/controllers.js