Merge remote-tracking branch 'origin/KGO-662-photos-show' into public
Merge branch 'KGO-728-create-curldataretriever' into public
Merge branch 'public' into classification

Conflicts:
	lib/DeviceClassifier.php
	lib/Kurogo.php
	lib/TemplateEngine.php
Merge branch 'public' into pagination
Merge branch 'public'
KGO-1221: Fixed typo enabling handling of No Content case. Changed links to include breadcrumb.
KGO-1220: Create header before links so breadcrumb navigation works.
KGO-1220: Place browse in resources tab.
Reconcile minor drifts in theme config.ini files for default and hi-def reference themes
Merge branch 'courses' of github.com:modolabs/Kurogo-Private-Mobile-Web into courses
KGO-1227
Merge branch 'public'
Merge branch 'refs/heads/master' into courses
include options in showTab
elapsed time shows date is greater than 1 week ago. KGO-1228
Merge branch 'public' into courses
load content in a new window
Refinement to size and position of resource list icons, and related list formatting
Merge branch 'courses' of github.com:modolabs/Kurogo-Private-Mobile-Web into courses
Fix some old incorrect CSS for basic branch, esp for spacing around heading elements