updating/revamping sample app
updating to API 1.25
Merge branch 'master' of https://github.com/evernote/evernote-sdk-ios

Conflicts:
	README.md

evernote-sdk-ios version 1.2.1 / 2013-06-12