update version
Merges Suryas changes
update version
fixes language on auth page
cleans up
up version
updated nshey json package number
updated package
Merge branch 'master' of https://github.com/antiboredom/nsheyy_gui

Conflicts:
	public/package.json