merge
Merge branch 'master' of github.com:SsnL/Wordless

Conflicts:
	Wordless/AppDelegate.swift
	Wordless/MasterViewController.swift
	Wordless/RSTMessage.swift
	Wordless/RSTUser.swift
	Wordless/Wordless-Bridging-Header.h