Merges Calfire app with master....