test
Merge branch 'master' of https://github.com/Sharasuke/marcokoendoc.git

Conflicts:
	DoCDB/src/com/marcokoen/docdb/MainBrowseActivity.java