UserManager Singleton Template
UserManager Simple Version
Merge branch 'Dev' into UserMamager

Conflicts:
	ItemAdvisor/ItemAdvisor.xcodeproj/project.pbxproj