fixed navbar
more fixing

removed ‘removed’ clause from database queries
Merge branch 'checkpoint1' of https://github.com/timsama/moodle into checkpoint1

Conflicts:
	view.php