Use templates for views (didn't work)
Merge branch 'master' of https://github.com/yondri/phonegap-workshop

Conflicts:
	index.html
	js/main.js