refactor
Merge branch 'master' of https://github.com/eranpeer/projects

Conflicts:
	mock4cpp/include/mock4cpp/StubbingImpl.h