todo renamed as artist
Merge branch 'master' of https://github.com/kylejginavan/mobile-angularjs

Conflicts:
	public/mobile/index.html