thur
t2
Merge branch 'master' of https://github.com/ajitha/ESTCP2

Conflicts:
	display/update.xaml.cs