try fix travis build (bis) (bis) (bis)
Merge branch 'master' of github.com:Emudofus/Photon