.
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	CloudServiceProgMVC.v12.suo