Merge branch 'release/20130820'
fixed: corrected comparation of searching keys
Merge branch 'hotfix/20131115' into develop