Localize resources
Clean up functions and template links
Localize resources
Clean up functions and template links
Resolve merge conflicts
Merge pull request #24 from stuycs-softdev/ben

Ben