fix(connection) hk's server
Merge branch 'master' into raghav

Conflicts:
	app/profile.py