fixed json
Merge branch '0.1' of github.com:openlets/openlets-spa into 0.1

Conflicts:
	app/views/api/v1/users/index.json.jbuilder