Refactored app Admin stuff to parallel cerad2; fixed deprecated references
Master Merge - gitignore, copy of project file
Master Merge - initial conflicts resloved
Master Merge - Tweaked assorted files