0211131600
0211131601
0213131613
0312131113
0312131115
0312131116
Merge branch 'master' of https://github.com/npavan/SampleSnap.git

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