Merge git.esoui.com:eso-CraftResearchTimer-Dad-88

Author His Dad <John@hisdad.org>
Author date 2014-12-22 03:32:53
Author local date 2014-12-22 16:32:53 +1300
Committer His Dad <John@hisdad.org>
Committer date 2014-12-22 03:32:53
Committer local date 2014-12-22 16:32:53 +1300
Commit de29f7470a93f0dc72e3e4a44576643e9ba73621
Tree 31edfe961a6835aa9de23af54ab119e926d02c27
Parent 48e22f0e01e2a4387498f0c2c8e665b579a0624e
Parent b6ef32ec7923d4b52c5314936b925d3bbbb7baba
Merge git.esoui.com:eso-CraftResearchTimer-Dad-88