Merge branch 'master'
Ignore changes to configs
Use assume-unchanged instead of gitignore
Visual update to match Rock RMS
Merge branch 'develop'