'merge'
/
Merge branch 'master' of https://github.com/fastcatsearch/techmanual

Conflicts:
	Techmanual/conf/routes
document add modify delete complete
document add modify delete complete