fixed som problems
removed empty paragraph
Merge commit '314fe405ddd92925d2179dc83c27ba4c3ae8c3b0'

Conflicts:
	VineScopeClient.v11.suo
Merge commit '16b0fae6c9c88c2d9556256a5346da79f7a7b4d5'
Merge commit '0e29411eea522c771a0cfc6326a8f0315ad69813'
Merge remote-tracking branch 'VineClient/master'