wip: stabalizing
wip
still won't work
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pushy Chat/Pushy Chat/Base.lproj/Main.storyboard