Update test.cpp
Merge branch 'master' into dev

Conflicts:
	lib/test.cpp