Merged AACore with ProvectusScientia, as well as switched from eclipse to idea completely (finally!)