added control markup
Added Adam'sBranch
Chamge to CZAOS.v11.suo
updated Master.html
Merge branch 'AdamBranch' of https://github.com/eric-citizen/AOS.git
added tab control updated common.js
Fixed merge error
Merge remote-tracking branch 'origin/AdamBranch'

Conflicts:
	Scripts/AOS.Common.js