another modification
merged
Merge branch 'master' of ssh://github.com/devji/admin-auto

Conflicts:
	HelloCountry.java