Lazy load activities
Lazy loading of data
Git strangeness
Merge origin/LL

Conflicts:
	src/main/java/edu/umm/radonc/ca_dash/model/ActivityController.java
	src/main/webapp/views/activity/List.xhtml
Merge origin/LL

Conflicts:
	src/main/java/edu/umm/radonc/ca_dash/model/ActivityController.java
	src/main/webapp/views/activity/List.xhtml