lots of ui changes
Merge branch 'master' of github.com:nikilster/Remember-When

Conflicts:
	Remember When.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:nikilster/Remember-When