Working on PopupLayer
	-Comitting Because Jackson done goofed
Merge branch 'master' of https://github.com/jacksonGross/UniLife

Conflicts:
	proj.ios_mac/UniLife.xcodeproj/project.pbxproj