Worked on handlebar template
Merge branch 'master' of https://github.com/rautio/Phonegap-workshop

Conflicts:
	index.html
	js/main.js