Added SSL
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/users/admin.json