temp send to fiend
Merge branch 'client'

Conflicts:
	js/services.js