Please enter the commit message for your changes. Lines starting
map WIP
merge
added framework
add strings for priorities and inventory
Merge branch 'master' of gdcgit:ronald.mai/torch
add productItemObject class which will be used as bean object for Product
add
add pics
add two pics
Added 3rd party controls - inner shadow view
commit images
commit pics
Merge branch 'master' of gdcgit:ronald.mai/torch

Conflicts:
	Torch/Torch.xcodeproj/project.pbxproj
adjust logic for base view
add new group for base controllers