Fixed issues with times in FF, safari(?)
Minor changes to admin edit user and discussion.php
Fixes to network and user registration
Merge branch 'local'
Adapting Sam's work on LTI
General Improvements to network and course permissions

- Network permissions allow private and public networks
- Course and discussion view and participation is based on user
preferences.
- Intermediary update, needs further work
Merge branch 'master' of https://github.com/dscourse/public

Conflicts:
	discussion.php
	js/dscourse.js
Mid-Change transfer

This is not a usable version. Some aspects of this commit need to be
finalized.
Merge branches 'local' and 'master' into local

Conflicts:
	adddisc.php
	discussion.php

Tyring to do a merge