Merge branch 'master' of http://bitbucket.org/dalerank/caesaria into android-build
merge with master
Update .travis.yml
Merge branch 'android-build' of https://github.com/dalerank/caesaria-game into android-build
Merge branch 'master' into android-build
Merge branch 'master' into android-build
merge with master
merge with master
Update .travis.yml
Update .travis.yml
Merge branch 'master' into android-build
Merge branch 'android-build' of https://github.com/dalerank/caesaria-game into android-build
Fix travis build for android
Merge branch 'android-build' of https://github.com/dalerank/caesaria-game into android-build
Merge branch 'master' into android-build
Merge branch 'master' of http://bitbucket.org/dalerank/caesaria into android-build
Merge branch 'master' into android-build
Merge branch 'android-build' of https://github.com/dalerank/caesaria-game into android-build
merge with master
Merge branch 'master' into android-build