Merging fortune-admin v1 from bitbucket back into the public realm
Merged gh-m