UPDATED the main convertDate function to return a better date
UPDATED the index and show room template
UPDATED the index.html to load locale config file of moment.js
Merge branch 'develop' of https://github.com/dotcreek/phonegap-backbone-estimotes into develop

Conflicts:
	App/app/scripts/main.js