Some files changed
Merge branch 'master' of https://github.com/vsai/g-ass-ass-ass-ass

Made some infrastructure changes.
merge conflicts