bug fix in master branch
Merge branch 'master' of github.com:istale/jspGitBranchTest into r2_contacts
added notes and completed coding