20140130
Merge origin/master

Conflicts:
	BotDmsFmWeb/src/java/ApplicationResource.properties
20140130