last commit 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	AriesPOS_V1.v12.suo
	AriesPOS_V1/bin/AriesPOS_V1.dll
	AriesPOS_V1/bin/AriesPOS_V1.pdb