Merge branch 'master' into 4-4

Conflicts:
app/index.html
app/scripts/controllers/dashboard.js
app/scripts/services/place.js