Adding app.yaml for pushing to app engine, fixing up grunt build and adding icons and tracks from API
Tweaked maps to work correctly
Change to non-italian
merging
First draft of speaker page
Merge branch 'master' of https://github.com/samdutton/conf

Conflicts:
	proto/app/styles/0-main.scss
Speakers CSS
map slider
merge to master
Speakers update
app/pages/map.html
Merge branch 'master' of https://github.com/samdutton/conf
last fix on mobile map page
requirejs component