ads
Merge branch 'master' of https://github.com/DaveLiu888/KPKiosk

Conflicts:
	Rails_jqMobile/app/views/users/index.html.erb