Latest suo file - (for Visual Studio)
Merge remote-tracking branch 'origin/master'

Conflicts:
	api-framework.v12.suo
removed json