70 Percent Addresses Functionality
Merge branch 'ui-template'
Merge branch 'master' of https://github.com/projectegon/egon
Merge branch 'master' into ui-template