Added collector unit
Merge branch 'issue163_baseCircuits' of https://github.com/open-ideas/IDEAS

Conflicts:
	IDEAS/Fluid/BaseCircuits/package.order
updated graphics of BaseCircuits