resolve data before showing the page
Merge branch 'resolve' into gh-pages

Conflicts:
	javascripts/main.js