Merging App and master before 04/04 meeting

Basic merge from App to Master to make everything the same