test
Merge remote-tracking branch 'origin/test'

Conflicts:
	build-ACliets-Desktop_Qt_5_3_MinGW_32bit-Debug/debug/base/database.sqlite