Merge branch 'PT' of https://github.com/TripletsGameViope2014/triplets i...

...nto PT