Merged dev 1.2.1 into dev1.2
merged and fixed conflict issues
Merge branch 'development' of https://github.com/AdamKyle/Aisis-Framework into development