Completed Augmented Reality and History features. Got rid of almost all warnings
Finished Augmented Reality and History features, removed most warnings, and fixed conflicts with Popup window commit