Bootstrapプラグインで、TwitterBootstrapを導入
Merge branch 'master' of https://github.com/wataruags/doremiru

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_doremiru-test_list
	app/tmp/cache/models/myapp_cake_model_default_doremiru-test_livehouses
	app/tmp/cache/models/myapp_cake_model_default_doremiru-test_places
	app/tmp/cache/models/myapp_cake_model_default_doremiru-test_shows_datas
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log