progress
Merge branch 'master' of https://github.com/dquijada/Resume

Conflicts:
	Resume.iOS/bin/iPhoneSimulator/Debug/Resume.exe
	Resume.iOS/bin/iPhoneSimulator/Debug/Resume.exe.mdb
	Resume.userprefs