$routeProvider fixes #41
Merge branch 'dev'

Conflicts:
	client/index.html