Begins work on customize message feature
Merge branch 'hotfix/infinite_loop_fix' into develop
Merge branch 'master' into feature/customize_message
Finishes customized message feature
Merge branch 'feature/customize_message' into develop
Adds comments and renames variables
Merge branch 'release/second_release'