add supervisions and subordinates roles
Merge branch 'master' of github.com:RoelandMatthijssens/tickClock

Conflicts:
	db/schema.rb