solved the issue of text_change on voyages
issues in bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	App_Code/Common.cs
	TestOcean.aspx.cs
	vwd.webinfo