First step
Start working with steps across multiple pages
Start work on fake service user
Merge branch 'master' into hopscotch

Conflicts:
	app/index.html
More fake service user attributes
Further tour steps
Attempt to get intercom working
Merge branch 'master' into intercom

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/factories/current_user.js
Only boot if user object valid
No longer use angular-intercom-mini roll with the SPA documentation
Get the Intercom messenger working