list teacher and only teachers, not regular users
Merge branch 'master' of github.com:wyrllyn/JEEproject

Conflicts:
	src/database/DatabaseInterface.java