Merge pull request #647 from bhariharan/unstable

Merge 'master' into 'unstable'
Replacing NSLog statements with SFLogger - FIRST PASS
Fix bug
Changing FMDB logs to debug level logs
Replace NSLog - SECOND PASS
Fix for compilation failure
Fix for smart store key generation
Merge pull request #648 from bhariharan/master

Replacing NSLog with debug level logging
Merge branch 'master' into unstable