Merge branch 'master' of https://github.com/medoc92/upplay
Authored by: Jean-Francois Dockes 2015-06-29
Parent(s): [8d9e2d][b22a0c]
Child(ren): [bd67df]