Merge pull request #122 from SCPR/calfire_app

Template updates and tweaks data lockout mechanism
updates 2013 fire aggregate data