put jquery into header of page15
Merge branch 'master' of https://github.com/chuej/namesake

Conflicts:
	tiapp.xml