merge
Fixed Merge in sever file
Merge branch 'master' of https://github.com/ehowlsla/ThankYouApi

Conflicts:
	app/resModles/ResContent.java