Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework.git
into beta
changes?