Changed structure of Model and removed dependencies
Merge commit '9159d6e6865f4ff77eb7f0e632d176976f10b266' into FD06-11

* commit '9159d6e6865f4ff77eb7f0e632d176976f10b266':
  Changed structure of Model and removed dependencies

Conflicts:
	SRS/Model