Merge branch 'master' of https://github.com/lurumad/tuenticontest2014