Bundle update 20141225180530
Merge branch 'tachikoma/update-20141225180530' of https://github.com/tachikomapocket/cesare-_-hanuman into tachikomapocket-tachikoma/update-20141225180530