Merge branch 'master' of https://github.com/cemerson/PhoneGap-3-Boilerplate

Conflicts:
	README.md
20131106.10