Merge branch 'santisp_dev' into develop

Adding ignores for codesniffer.

Problem with mixed emails sent when made simultaneously on checkout s…

…olved. closes#147

change versions

Merge branch 'santisp_dev' into develop

Merge branch 'develop'

Merge branch 'develop'

Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/develop'

Merged develop branch.