Saving current state of development.
Merge branch 'master' into develop
Style update.
Post merge style update.
Merged dev branch.