for pull
Merge branch 'master' of https://github.com/mikeslim7/phonegap-start

Conflicts:
	js/index.js
page load