Merging Debolin's changes
Merge branch 'master' of https://github.com/SDState/ag-heritage-prototype