Files updated for merge with master app