maven refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	toc-modules/toc-services.iml
maven refactoring