minor changes
Merge branch 'master' of https://github.com/UmlSync/umlsync

Conflicts:
	diagrammer/dm/ms/us/dialogs.js
#153 Added intranet solution.