branch 6 4.6

Change-Id: Ib69804532c1f4f6c5ed34727dc5513dd0ca9b6cf
Merge branch 'miss' of https://github.com/awsmuser01/awsmrepo into
branch6

Conflicts:
	Awsmproject/src/com/awsm/database/Test1.java