test change UI
Merge branch 'master' of github.com:2014-sed-team3/term-project

Conflicts:
	project/Src/NetworkVis03/NetworkVis.sln