Had to git before sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	GladanCRUD.v12.suo