Adding functionalities
Merge branch 'Testing' of github.com:naio/OzVision into Testing

Conflicts:
	src/Core.cpp