reset try 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndorsTrail/res/values/loadresources.xml