Added model tests
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/model/Model.java
Merge
Test folder should be marked as such
Merge remote-tracking branch 'origin/dev' into dev