re-commit
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework into beta