Merge pull request #1 from cirnocee/Cee's-Testing-Branch

Cee's testing branch
Merge pull request #2 from cirnocee/Cee's-Testing-Branch

Cee's testing branch
Fix login issues & Add setting panel
Merge branch 'master' into Cee's-Testing-Branch

Conflicts:
	Xccount/Xccount.xcodeproj/project.pbxproj

Xccount/Xccount.xcodeproj/project.xcworkspace/xcuserdata/Cee.xcuserdatad
/UserInterfaceState.xcuserstate
	Xccount/Xccount/Base.lproj/Main.storyboard
	Xccount/Xccount/SettingsTVC.h
	Xccount/Xccount/SettingsTVC.m
	Xccount/Xccount/ShowBriefInfoViewController.h
	Xccount/Xccount/ShowBriefInfoViewController.m