added action sheet stuff

FIRST REAL COMMIT IN 2 HOURS
Merge branch 'VikrumBranch'
Merge branch 'master' into VikrumBranch
Merge branch 'VikrumBranch'
Merge branch 'master' into tarandeepBranch

Conflicts:
	Fynd/PinViewController.m