Merge vorawats/master

Conflicts:
	BotDmsFmWeb/src/java/struts.xml