add
Merge branch 'master' of https://github.com/EvgenMeshkin/test

Conflicts:
	APIclient/app/src/main/res/layout/activity_wiki.xml