one time log in enabled
Merge branch 'master' of https://github.com/hengjiaqi/sanbox

Conflicts:
	Storyboard.storyboard
last change