Implement Time slots
Merge branch 'dev' into times

Conflicts:
	src/ClassNode.java
Fix bug
Merge branch 'dev'