3 SOP
Merge branch 'master' of https://github.com/npavan/SampleSnap.git

Conflicts:
	src/com/snapfish/user/Test1.java